message order fix