Watcher fix