fix messages order