Fixed rotator issue