Fix watched_by scope