Fix watcher