Switcher Fix

Switcher Fix