Fixed broadcast message issue