Fix movement bug