Very simple fix for broadcasting messages