Fix for broadcast module