diff --git a/.travis.yml b/.travis.yml
index 86204ac..aa84b51 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,7 +3,7 @@ git:
 
 env:
   - HUGO_VERSION="0.48"
-  - HUGO_VERSION="0.49.1"
+  - HUGO_VERSION="0.49.2"
 
 install:
   - wget -q https://github.com/gohugoio/hugo/releases/download/v${HUGO_VERSION}/hugo_${HUGO_VERSION}_Linux-64bit.tar.gz
diff --git a/layouts/blog/single.html b/layouts/blog/single.html
index 35d4d4c..b2beac3 100644
--- a/layouts/blog/single.html
+++ b/layouts/blog/single.html
@@ -43,10 +43,11 @@
         </div>
         {{ end }}
         {{ if .Params.tags }}
+        {{ $len := (len .Params.tags) }}
         <p>
-            Tag{{ if gt (len .Params.tags) 1 }}s{{ end }}:
+            Tag{{ if gt $len 1 }}s{{ end }}:
             {{ range $index, $tag := .Params.tags }}
-            {{ if gt $index 0 }}, {{ end }}<a href="{{ "/tags/" | absLangURL }}{{ . | urlize }}">{{ . }}</a>
+            <a href="{{ "/tags/" | absLangURL }}{{ . | urlize }}">{{ . }}</a>{{ if ne (add $index 1) $len }},{{ end }}
             {{ end }}
         </p>
         {{ end }}