Fixed issue with watcher