fix switcher watcher