diff --git a/src/current/c1map/render.xsl b/src/current/c1map/render.xsl
index c81e1431..ae127674 100644
--- a/src/current/c1map/render.xsl
+++ b/src/current/c1map/render.xsl
@@ -354,15 +354,14 @@
   ]
 ">
   <!-- select the nearest condition -->
-  <xsl:variable name="cond" as="element( lvmp:condition )"
-                select="ancestor::lvmp:condition[1]" />
+  <xsl:variable name="cond" select="ancestor::lvmp:condition[1]" />
 
   <xsl:text>( ( </xsl:text>
     <xsl:text>$contract->isTruthy( </xsl:text>
       <xsl:apply-templates select="$cond/lvmp:when/lvmp:*" mode="lvmp:render" />
-      <xsl:if test="$cond/lvmp:cmp/text() != ''">
+      <xsl:if test="$cond/lvmp:cmp/*">
         <xsl:text>,</xsl:text>
-        <xsl:apply-templates select="$cond/lvmp:cmp/text()" mode="lvmp:render" />
+        <xsl:apply-templates select="$cond/lvmp:cmp/lvmp:*" mode="lvmp:render" />
       </xsl:if>
     <xsl:text>)</xsl:text>
   <xsl:text> ) ? </xsl:text>