Movement bug fix