fix switcher