Fixing graph watcher