Rotation is better handled, but still not perfect.