TW-13: Fixes the watcher