Fixed Broadcast issues