Another broadcasting fix