fix watcher/sensor assignment