Fix message to consumers