Fixen infinite turn and move bug