Fix: Do not reset variables when watcher is initialized