Fix @BroadcasterService not working
Backport fix for BroadcasterService detection