Broadcast propagation hotfix