Fixed broadcast messages handling