fix value watcher