diff --git a/xml/xslt/auto.xslt b/xml/xslt/auto.xslt
index 11d0cf7..5a72111 100644
--- a/xml/xslt/auto.xslt
+++ b/xml/xslt/auto.xslt
@@ -500,7 +500,7 @@
                 </fo:list-block>
             </xsl:when>
             <xsl:when test="@format = 'table'">
-                <fo:table xsl:use-attribute-sets="breakdowntable">
+                <fo:block xsl:use-attribute-sets="keep-together"><fo:table xsl:use-attribute-sets="breakdowntable">
                     <fo:table-column column-width="proportional-column-width(6)"
                         xsl:use-attribute-sets="borders"/>
                     <fo:table-column column-width="proportional-column-width(2)"
@@ -616,7 +616,7 @@
                             </fo:table-cell>
                         </fo:table-row>
                     </fo:table-body>
-                </fo:table>
+                </fo:table></fo:block>
 
 
                 <xsl:if test="$serviceNodeSet/entry/@estimate = true()">
diff --git a/xml/xslt/styles.xslt b/xml/xslt/styles.xslt
index d1f8ad6..89d2afe 100644
--- a/xml/xslt/styles.xslt
+++ b/xml/xslt/styles.xslt
@@ -18,7 +18,7 @@
 
     <!-- User-accessible classes -->
     <xsl:attribute-set name="keep-together">
-        <xsl:attribute name="keep-together">always</xsl:attribute>
+        <xsl:attribute name="keep-together.within-page">always</xsl:attribute>
     </xsl:attribute-set>
 
     <!-- Common settings -->