Fixed 'moving too soon' bug