Correct ordering of repeated fields to be consistent