corrected bug with watcher