Fixing bug in ChangeWatcher