movement bug-fix