Fix issue with wrong order on list with random failures