DataWatcher fix