diff --git a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/functions.xsl b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/functions.xsl
index 83b49c035..6088e82f0 100644
--- a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/functions.xsl
+++ b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/functions.xsl
@@ -41,6 +41,13 @@ exclude-result-prefixes="#all"
         <xsl:sequence select="xs:anyURI(ixsl:get(ixsl:window(), 'LinkedDataHub.base'))"/>
     </xsl:function>
     
+    <!-- TO-DO: replace with standard XPath `base-uri` after this is fixed: -->
+    <xsl:function name="ldh:base-uri" as="xs:anyURI?">
+        <xsl:param name="arg" as="node()"/>
+        
+        <xsl:sequence select="if (ixsl:contains($arg, 'baseURI')) then ixsl:get($arg, 'baseURI') else ()"/>
+    </xsl:function>
+    
     <xsl:function name="ac:uri" as="xs:anyURI">
         <xsl:sequence select="xs:anyURI(ixsl:get(ixsl:window(), 'LinkedDataHub.uri'))"/>
     </xsl:function>
diff --git a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/client.xsl b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/client.xsl
index ce87ab87c..50a2bcc67 100644
--- a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/client.xsl
+++ b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/client.xsl
@@ -513,7 +513,10 @@ WHERE
         </xsl:if>
         
         <xsl:for-each select="?body">
-            <xsl:message>RDF BASE URI: <xsl:value-of select="base-uri()"/></xsl:message>
+            <xsl:message>RDF base-uri(?body): <xsl:value-of select="base-uri()"/></xsl:message>
+            <xsl:message>RDF base-uri(ixsl:page()): <xsl:value-of select="ixsl:page()"/></xsl:message>
+            <xsl:message>RDF ldh:base-uri(?body): <xsl:value-of select="ldh:base-uri(.)"/></xsl:message>
+            <xsl:message>RDF ldh:base-uri(ixsl:page()): <xsl:value-of select="ldh:base-uri(ixsl:page())"/></xsl:message>
         
             <xsl:variable name="results" select="." as="document-node()"/>
             <ixsl:set-property name="{'`' || $uri || '`'}" select="ldh:new-object()" object="ixsl:get(ixsl:window(), 'LinkedDataHub.contents')"/>
@@ -898,7 +901,10 @@ WHERE
         
         <ixsl:set-style name="cursor" select="'default'" object="ixsl:page()//body"/>
 
-        <xsl:message>HTML BASE URI: <xsl:value-of select="base-uri()"/></xsl:message>
+        <xsl:message>HTML base-uri(.): <xsl:value-of select="base-uri()"/></xsl:message>
+        <xsl:message>HTML ldh:base-uri(.): <xsl:value-of select="ldh:base-uri(.)"/></xsl:message>
+        <xsl:message>HTML ldh:base-uri(ixsl:page()): <xsl:value-of select="ldh:base-uri(ixsl:page())"/></xsl:message>
+            
         <ixsl:set-property name="uri" select="$uri" object="ixsl:get(ixsl:window(), 'LinkedDataHub')"/>
         <xsl:if test="$endpoint">
             <ixsl:set-property name="endpoint" select="$endpoint" object="ixsl:get(ixsl:window(), 'LinkedDataHub')"/>