Fixed the movement issues