Fix ordering of replies