Fix ShiftGroup in Shift