CDB-2891 small bugfix regarding watcher