* Rotator hotfix