MovementBug fix
merged bugfix