diff --git a/templates/content-episode.tpl.html b/templates/content-episode.tpl.html
index 43a12bc..13dca3e 100644
--- a/templates/content-episode.tpl.html
+++ b/templates/content-episode.tpl.html
@@ -49,7 +49,7 @@
 	<header>
 		<h1>hpr<!--% episode.id %--> :: <!--% episode.title %--></h1>
 		<h3><!--% episode.summary %--></h3>
-		<p class="meta"><!--% step_navigation(episode) %-->
+		<p class="meta"><!--% step_navigation(baseurl,episode) %-->
 		</p>
 <p><!--% IF get_avatar(episode.hostid) != 'hpr_logo.png' %-->
 <img src="<!--% absolute_path(baseurl) %-->images/<!--% get_avatar(episode.hostid) %-->" height="80" width="80" alt="" /></a><br><!--% END %-->
diff --git a/templates/shared-utils.tpl.html b/templates/shared-utils.tpl.html
index 8143cb4..d24519d 100644
--- a/templates/shared-utils.tpl.html
+++ b/templates/shared-utils.tpl.html
@@ -16,17 +16,17 @@
 <!--% IF baseurl %-->./<!--% ELSE %-->/<!--% END %-->
 <!--% END %-->
 
-<!--% MACRO step_navigation(links) BLOCK %-->
-<small><a href="<!--% absolute_url(baseurl) %-->eps/hpr<!--% zero_pad_left(links.earliest) %-->/index.html" rel="first">&lt;&lt; First</a>, 
+<!--% MACRO step_navigation(baseurl, links) BLOCK %-->
+<small><a href="<!--% absolute_path(baseurl) %-->eps/hpr<!--% zero_pad_left(links.earliest) %-->/index.html" rel="first">&lt;&lt; First</a>, 
 	<!--% IF links.previous %-->
-	<a href="<!--% absolute_url(baseurl) %-->eps/hpr<!--% zero_pad_left(links.previous) %-->/index.html" rel="previous">&lt; Previous</a>,
+	<a href="<!--% absolute_path(baseurl) %-->eps/hpr<!--% zero_pad_left(links.previous) %-->/index.html" rel="previous">&lt; Previous</a>,
 	<!--% ELSE %-->
 	<span>&lt;</span> Previous,
 	<!--% END %-->
 	<!--% IF links.next %-->
-	<a href="<!--% absolute_url(baseurl) %-->eps/hpr<!--% zero_pad_left(links.next) %-->/index.html" rel="next">Next &gt;</a>,
+	<a href="<!--% absolute_path(baseurl) %-->eps/hpr<!--% zero_pad_left(links.next) %-->/index.html" rel="next">Next &gt;</a>,
 	<!--% ELSE %-->
 	Next <span>&gt;</span>
 	<!--% END %-->
-	<a href="<!--% absolute_url(baseurl) %-->eps/hpr<!--% zero_pad_left(links.latest) %-->/index.html" rel="last">Latest &gt;&gt;</a></small>
+	<a href="<!--% absolute_path(baseurl) %-->eps/hpr<!--% zero_pad_left(links.latest) %-->/index.html" rel="last">Latest &gt;&gt;</a></small>
 <!--% END %-->