diff --git a/module/fid_bbi/src/fid_bbi/RecordDriver/SolrMarcFincTrait.php b/module/fid_bbi/src/fid_bbi/RecordDriver/SolrMarcFincTrait.php
index 462b6b4abcc6a5840c3369d6900b8302fcfbfeb1..c784470f69ce85feaafeaeb504e4a9bba4fa9e4d 100644
--- a/module/fid_bbi/src/fid_bbi/RecordDriver/SolrMarcFincTrait.php
+++ b/module/fid_bbi/src/fid_bbi/RecordDriver/SolrMarcFincTrait.php
@@ -164,11 +164,18 @@ trait SolrMarcFincTrait
             $text = $t->getData();
             $d = $marc773->getSubfield('d');
             if (!empty($d)) $text .= ', '.$d->getData();
-            if ($marc936 = $this->getMarcRecord()->getField('936'))
+            if (
+                $marc936 = $this->getMarcRecord()->getField('936')
+                &&
+                $h = $marc936->getSubfield('h')
+            )
             {
-                if ($h = $marc936->getSubfield('h'))
+                $text .= ', S. '.$h->getData();
+            }
+            else {
+                foreach ($marc773->getSubfields('g') as $sub)
                 {
-                    $text .= ', S. '.$h->getData();
+                    $text .= ', '.$sub->getData();
                 }
             }