Fix message issue