Fix Rotation errors