Condition on yaw to stop tack: made it easy and robust