Rotation switching fix
<CS6 Group fix