Make sure the response is ordered correctly