Angle tracking bug fix