fixed broadcast
merge