fix message broadcasting