Fixing another bug in ChangeWatcher