Fix message a bit