Better rotation support for mystery person