diff --git a/blocks/eda-frontend/public/splitblock.xsl b/blocks/eda-frontend/public/splitblock.xsl
index d6299c6a..974b24c3 100644
--- a/blocks/eda-frontend/public/splitblock.xsl
+++ b/blocks/eda-frontend/public/splitblock.xsl
@@ -624,7 +624,7 @@
   <!-- }}}1 -->
 
   <!-- SplitBlock template {{{1 -->
-  <xsl:template match="/XcosDiagram/mxGraphModel/root/SplitBlock[position() = 1]">
+  <xsl:template match="//SplitBlock[position() = 1]">
     <xsl:variable name="InputPort" select="key('k-explicitinput', @id)" />
     <xsl:variable name="OutputPort" select="key('k-explicitoutput', @id)" />
 
@@ -1061,9 +1061,9 @@
   <!-- Port template {{{1 -->
   <xsl:template match="ExplicitInputPort | ExplicitOutputPort | ImplicitInputPort | ImplicitOutputPort | ControlPort | CommandPort">
     <xsl:variable name="parentId" select="@parent" />
-    <xsl:variable name="SPLIT" select="/XcosDiagram/mxGraphModel/root/SplitBlock[position() = 1]" />
+    <xsl:variable name="SPLIT" select="(//SplitBlock)[1]/@id" />
 
-    <xsl:if test="$parentId != $SPLIT/@id">
+    <xsl:if test="$parentId != $SPLIT">
       <xsl:copy>
         <xsl:copy-of select="@*" />
         <xsl:copy-of select="node()" />
@@ -1076,7 +1076,7 @@
   <xsl:template match="ExplicitLink | CommandControlLink | ImplicitLink">
     <xsl:variable name="sourceElement" select="key('k-portorlink', @source)" />
     <xsl:variable name="targetElement" select="key('k-portorlink', @target)" />
-    <xsl:variable name="SPLITID" select="/XcosDiagram/mxGraphModel/root/SplitBlock[position() = 1]/@id" />
+    <xsl:variable name="SPLITID" select="(//SplitBlock)[1]/@id" />
     <xsl:if test="$sourceElement/@parent != $SPLITID and $targetElement/@parent != $SPLITID">
       <xsl:variable name="srcsrcid" select="key('k-portorlink', $sourceElement/@source)/@parent" />
       <xsl:variable name="srctgtid" select="key('k-portorlink', $sourceElement/@target)/@parent" />
diff --git a/blocks/eda-frontend/src/utils/GalleryUtils.js b/blocks/eda-frontend/src/utils/GalleryUtils.js
index 7e6a6bf7..70e0efbf 100644
--- a/blocks/eda-frontend/src/utils/GalleryUtils.js
+++ b/blocks/eda-frontend/src/utils/GalleryUtils.js
@@ -33,7 +33,7 @@ const getSplitXsltProcessor = async () => {
   return processor
 }
 
-const splitBlockXPathCount = 'count(/XcosDiagram/mxGraphModel/root/SplitBlock)'
+const splitBlockXPathCount = 'count(//SplitBlock)'
 
 const countNodesByXPath = (xpath, contextNode) => {
   const result = contextNode.evaluate(xpath, contextNode, null, XPathResult.NUMBER_TYPE, null)
@@ -62,7 +62,7 @@ const removeOneSplit = (xmlDoc, count, splitProcessor) => {
 
   xmlDoc = splitProcessor.transformToDocument(xmlDoc)
   const newCount = countNodesByXPath(splitBlockXPathCount, xmlDoc)
-  if (newCount !== count - 1) {
+  if (newCount >= count) {
     console.error('newCount=', newCount, ', count=', count)
     throw new Error('count mismatch')
   }
diff --git a/blocks/xcos2xml/replacesplitblocks.sh b/blocks/xcos2xml/replacesplitblocks.sh
index 0b5f751a..24058921 100755
--- a/blocks/xcos2xml/replacesplitblocks.sh
+++ b/blocks/xcos2xml/replacesplitblocks.sh
@@ -92,7 +92,8 @@ if test -n "$INPUTXML"; then
   Xcos/MxGraphParser.py "$INPUTXML" "$WORKSPACE" "$CONTEXT"
 fi
 
-count=$(grep -c '^      <SplitBlock' "$INPUT") || :
+# count=$(grep -c '^      <SplitBlock' "$INPUT") || :
+count=$(grep -c '^[[:space:]]*<SplitBlock' "$INPUT") || :
 INPUT1="$BASE-$count.xml"
 echo "Creating $INPUT1"
 cp -f "$INPUT" "$INPUT1"
@@ -102,15 +103,23 @@ while test $count -gt 0; do
 
   xsltproc "$SPLITXSL" "$INPUT1" >"$TMPFILE1"
   xmllint --format "$TMPFILE1" >"$TMPFILE2"
-  count=$(grep -c '^      <SplitBlock' "$TMPFILE2") || :
+  # count=$(grep -c '^      <SplitBlock' "$TMPFILE2") || :
+  count=$(grep -c '^[[:space:]]*<SplitBlock' "$TMPFILE2") || :
+
+  if ((count >= oldcount)); then
+    echo "ERROR: SplitBlock count did not decrease (old=$oldcount, new=$count)" >&2
+    exit 2
+  fi
   INPUT1="$BASE-$count.xml"
   echo "Creating $INPUT1"
   cp -f "$TMPFILE2" "$INPUT1"
 
-  if ((count != oldcount - 1)); then
-    echo "ERROR: $count != $oldcount - 1" >&2
-    exit 2
-  fi
+  # if ((count != oldcount - 1)); then
+  # if ((count < oldcount)); then
+  #   # echo "ERROR: $count != $oldcount - 1" >&2
+  #   echo "ERROR: $count < $oldcount" >&2
+  #   exit 2
+  # fi
 done
 
 xsltproc "$XSL" "$INPUT1" >"$TMPFILE1"