Fix message splitting