Fix message format issue