Collision fix for movement - TEST IT! :D