fix switcher bug