fix rotator issues