Fix message converting