Angle fixing after every move, much safer