Fix watcher so it'll work properly.