my $i = shift @_ || 0;
- my @out = $marc->getvalue({record=>$marc->marc_count(),field=>$f,subfield=>$s});
+ my $rec = $main::cache->{marc_record} || die '$cache->{marc_record} is undefined!';
+
+ my @out = $marc->getvalue({record=>$rec,field=>$f,subfield=>$s});
return $out[$i] if (@out && $out[$i]);
}