diff --git a/links.xsl b/links.xsl
index 5c78d8f..e4de2ac 100644
--- a/links.xsl
+++ b/links.xsl
@@ -5,11 +5,11 @@
  <!-- The purpose of this module is to perform flattening of nested links. -->
  <xsl:template match="f:link">
   <span class="link {@type}">
-   <xsl:apply-templates />
+   <xsl:apply-templates mode="link-flattening" />
   </span>
  </xsl:template>
 
- <xsl:template match="f:link//text()">
+ <xsl:template match="f:link//node()[not(f:link)]" mode="link-flattening">
   <a href="{ancestor::f:link[1]/@href}">
    <xsl:choose>
     <xsl:when test="ancestor::f:link[1]/@addr">
@@ -27,7 +27,7 @@
      </xsl:attribute>
     </xsl:otherwise>
    </xsl:choose>
-   <xsl:value-of select="." />
+   <xsl:apply-templates select="." />
   </a>
  </xsl:template>