Fix for moving in same direction as button press