Fixed movement issue