Fixed Switchers

Fixed Switchers