Improve auto broadcast