Fixes being able to move when you shouldn't be able to (#669)

Fixes being able to move when you shouldn't be able to (#669) #488