Correct message ordering