Fixed movement again