Fix broadcast code