Fix movement bug. Helps to reset things correctly.