fix watcher