Fix broadcast API #59