Fixed bug with movement