Fix broadcasting bug