diff --git a/solr/contrib/velocity/src/resources/_macros.vm b/solr/contrib/velocity/src/resources/_macros.vm
index 51c232cfcdb..83382825c39 100644
--- a/solr/contrib/velocity/src/resources/_macros.vm
+++ b/solr/contrib/velocity/src/resources/_macros.vm
@@ -40,7 +40,7 @@
         #set($pad = " ... ")
       #end
   #else
-    #foreach($v in $doc.getFieldValues($f))$esc.html($v)#end
+    $esc.html($display.list($doc.getFieldValues($f), ", "))
   #end
 #end