fixed broadcast issues