Fix broadcast code #55