Fixed broadcast issue