Fix giant broadcasting bug