Fixed yaw issue