Gateway broadcast fix