fixing nodes_watcher implementation