diff --git a/suse2022-ns/fo/block.xsl b/suse2022-ns/fo/block.xsl
index 14277d93..ac54ae87 100644
--- a/suse2022-ns/fo/block.xsl
+++ b/suse2022-ns/fo/block.xsl
@@ -96,7 +96,7 @@
        need to add another one, $last-char allows us to check. -->
   <xsl:variable name="last-char-candidate">
     <xsl:choose>
-      <xsl:when test="$titlestr != ''">
+      <xsl:when test="$ns-titlestr != ''">
         <xsl:value-of select="substring($ns-titlestr, string-length($ns-titlestr),1)"/>
       </xsl:when>
       <xsl:otherwise>FAIL</xsl:otherwise>
diff --git a/suse2022-ns/xhtml/block.xsl b/suse2022-ns/xhtml/block.xsl
index 3e228811..723dd611 100644
--- a/suse2022-ns/xhtml/block.xsl
+++ b/suse2022-ns/xhtml/block.xsl
@@ -132,7 +132,7 @@
   </xsl:variable>
   <xsl:variable name="ns-titleStr" select="normalize-space($titleStr)"/>
   <xsl:variable name="lastChar">
-    <xsl:if test="normalize-space($ns-titleStr) != ''">
+    <xsl:if test="$ns-titleStr != ''">
       <xsl:value-of select="substring($ns-titleStr, string-length($ns-titleStr), 1)"/>
     </xsl:if>
   </xsl:variable>
@@ -144,7 +144,6 @@
         <xsl:with-param name="key">runinhead.default.title.end.punct</xsl:with-param>
       </xsl:call-template>
     </xsl:if>
-    <!--<xsl:text>&#160;</xsl:text>-->
   </span>
 </xsl:template>