- my ($letter, $value) = @$_;
- $letter = '@' unless $letter;
- push @subfield_loop, { marc_subfield => $letter, marc_value => $value };
+ my $letter = $_->[0];
+ next if defined $subfields{$letter};
+ my @values = $field->subfield($letter);
+ $subfields{$letter} = \@values;
+ }
+
+ # Add all subfields to the subfield_loop
+ for( keys %subfields ) {
+ my $letter = $_ || '@';
+ push( @subfield_loop, {marc_subfield => $letter, marc_values => $subfields{$_}} );