Bugfix on broadcast messages