Fix message suffix problem