Fix Watcher