Fix Broadcast for Prefix support