fix message_split bugs