Merge pull request #594 from Kinematics/4.1-dev

Core fixed, so reverting to the original code.