diff --git a/layouts/partials/publication.html b/layouts/partials/publication.html
index 234db7f..6fafb3a 100644
--- a/layouts/partials/publication.html
+++ b/layouts/partials/publication.html
@@ -10,16 +10,18 @@
              class="w-full"/>
     </div>
     <div class="publication grow shrink-2 basis-3/4 my-1.5 mx-2">
-        {{ range $author_index, $author_val := .authors }}
-        {{ if $author_val.me }}
-        <b>
-        {{ end }}
-            <span itemprop="author">{{- $author_val.name -}}</span>
-            {{- /* Add comma if not last author */ -}}
-            {{- if le $author_index (len .) -}},{{- end -}}
-        {{ if $author_val.me }}
-        </b>
-        {{ end }}
+        {{ with $authorlist := .authors }}
+            {{ range $author_index, $author_val := $authorlist }}
+            {{ if $author_val.me }}
+            <b>
+            {{ end }}
+                <span itemprop="author">{{- $author_val.name -}}</span>
+                {{- /* Add comma if not last author */ -}}
+                {{- if lt $author_index (sub (len $authorlist) 1) -}},{{- end -}}
+            {{ if $author_val.me }}
+            </b>
+            {{ end }}
+            {{ end }}
         {{ end }}
         <br>
         <b>