Fix message transforming