switcher fix