Fix message order problem