Elbow yaw fix