Fixed broadcast and wait with watchers