diff --git a/layouts/partials/bottom_nav_icons.html b/layouts/partials/bottom_nav_icons.html
index 138e367..861ea20 100644
--- a/layouts/partials/bottom_nav_icons.html
+++ b/layouts/partials/bottom_nav_icons.html
@@ -1,6 +1,8 @@
 {{ with .Site.Params.bottom_nav_icons }}
 	{{ range . }}
-		<a class="icon" href="{{ .link | safeURL }}"  target="_blank">
+		<!-- safeURL only works when the link is stored in a variable -->
+		{{ $link := .link }}
+		<a class="icon" href="{{ $link | safeURL }}"  target="_blank">
 			<img src="/img/{{ .icon }}" alt="{{ .icon_alt }}" title="{{ .title }}" />
 		</a>
 	{{ end }}
diff --git a/layouts/partials/nav_links.html b/layouts/partials/nav_links.html
index 7f54328..7e3af65 100644
--- a/layouts/partials/nav_links.html
+++ b/layouts/partials/nav_links.html
@@ -1,5 +1,7 @@
 {{ with .Site.Params.nav_links }}
 	{{ range . }}
-		<a href="{{ .link | safeURL }}" title="{{ .title }}">{{ .title }}</a>
+		<!-- safeURL only works when the link is stored in a variable -->
+		{{ $link := .link }}
+		<a href="{{ $link | safeURL }}" title="{{ .title }}">{{ .title }}</a>
 	{{ end }}
 {{ end }}
\ No newline at end of file
diff --git a/layouts/partials/right_icons.html b/layouts/partials/right_icons.html
index 3200894..e27d4b4 100644
--- a/layouts/partials/right_icons.html
+++ b/layouts/partials/right_icons.html
@@ -1,7 +1,10 @@
 {{ with .Site.Params.right_icons }}
 	{{ range . }}
 		{{ $target := cond .external "_blank" "_self" }}
-		<a class="icon" href="{{ .link | safeURL }}"  target="{{ $target }}">
+		
+		<!-- safeURL only works when the link is stored in a variable -->
+		{{ $link := .link }}
+		<a class="icon" href="{{ $link | safeURL }}"  target="{{ $target }}">
 			<img src="/img/{{ .icon }}" alt="{{ .icon_alt }}" title="{{ .title }}" />
 		</a>
 	{{ end }}