Hack fix for movement bug