Reorder the fields to make the ordering more natural