[watcher] small improvment