Fix the inconsistency in movement.  Thanks to Nikolay Kudryavtsev.