Merge pull request #2103 from dibdot/force_fix