BugFix: Broadcaster fixed