diff --git a/ccm-core/web/themes/foundry/foundry/lib/template-tags/content-items/mpa.xsl b/ccm-core/web/themes/foundry/foundry/lib/template-tags/content-items/mpa.xsl
index 8f43a8846..d8078845e 100644
--- a/ccm-core/web/themes/foundry/foundry/lib/template-tags/content-items/mpa.xsl
+++ b/ccm-core/web/themes/foundry/foundry/lib/template-tags/content-items/mpa.xsl
@@ -77,12 +77,12 @@
                       select="$contentitem-tree/cms:mpadata/numberOfPages"/>
         
         <xsl:for-each select="$contentitem-tree/sections">
-            <xsl:sort select="./rank"/>
+            <xsl:sort select="./rank" data-type="number"/>
             
             <xsl:variable name="current-rank" select="./rank"/>
             <xsl:variable name="page-number" 
                           select="count($contentitem-tree/sections[./pageBreak = 'true' 
-                                                                   and ./rank &lt; $current-rank]) + 1"/>
+                                                                   and ./rank &lt; ($current-rank + 1)])"/>
             
             <xsl:apply-templates select="$section-layout-tree/*">