Fixed logic for watcher notification.