Better hanlding of repeated field.