Fix the watcher