Collision error fixes by moving wall check