watcher fix