Fix message-received marshalling