Fix infinite loop caused by watcher fix.