Fix for watcher