diff --git a/modules/paper-calendar.xml b/modules/paper-calendar.xml
index 20ef24b..bcfe858 100644
--- a/modules/paper-calendar.xml
+++ b/modules/paper-calendar.xml
@@ -878,7 +878,7 @@
 		<common formats="/latex/xelatex/">
 		    <xsl:if test="$numbered = 'yes'">
                 <xsl:call-template name="generate-number-cell">
-                    <xsl:with-param name="rows" select="if ( @rows ) then @rows else 2" />
+                    <xsl:with-param name="rows" select="if ( @rows ) then @rows else ancestor::calendar/@lectures-per-week" />
                     <xsl:with-param name="number" select="1 + count( preceding::laboratory[node()] )" />
                 </xsl:call-template>
                 
@@ -887,14 +887,14 @@
 	
 			<xsl:call-template name="generate-content-cell">
 				<xsl:with-param name="columns" select="if ( $numbered = 'yes' ) then 1 else 2" />
-                <xsl:with-param name="rows" select="if ( @rows ) then @rows else 2" />
+                <xsl:with-param name="rows" select="if ( @rows ) then @rows else ancestor::calendar/@lectures-per-week" />
 			</xsl:call-template>
 		</common>
 		<common formats="/html/xhtml/">
 		    <xsl:if test="$numbered = 'yes'">
                 <xsl:call-template name="generate-number-cell">
                     <xsl:with-param name="colour">ltblue</xsl:with-param>
-                    <xsl:with-param name="rows" select="if ( @rows ) then @rows else 2" />
+                    <xsl:with-param name="rows" select="if ( @rows ) then @rows else ancestor::calendar/@lectures-per-week" />
                     <xsl:with-param name="number" select="1 + count( preceding::laboratory[node()] )" />
                 </xsl:call-template>
             </xsl:if>
@@ -902,7 +902,7 @@
 			<xsl:call-template name="generate-content-cell">
 				<xsl:with-param name="colour">ltblue</xsl:with-param>
 				<xsl:with-param name="columns" select="if ( $numbered = 'yes' ) then 1 else 2" />
-                <xsl:with-param name="rows" select="if ( @rows ) then @rows else 2" />
+                <xsl:with-param name="rows" select="if ( @rows ) then @rows else ancestor::calendar/@lectures-per-week" />
 			</xsl:call-template>
 		</common>
 	</template>
@@ -927,7 +927,7 @@
 		<common formats="/latex/xelatex/">
 		    <xsl:if test="$numbered = 'yes'">
                 <xsl:call-template name="generate-number-cell">
-                    <xsl:with-param name="rows" select="if ( @rows ) then @rows else 2" />
+                    <xsl:with-param name="rows" select="if ( @rows ) then @rows else ancestor::calendar/@lectures-per-week" />
                     <xsl:with-param name="number" select="1 + count( preceding::tutorial[node()] )" />
                 </xsl:call-template>
                 
@@ -936,14 +936,14 @@
 	
 			<xsl:call-template name="generate-content-cell">
 				<xsl:with-param name="columns" select="if ( $numbered = 'yes' ) then 1 else 2" />
-                <xsl:with-param name="rows" select="if ( @rows ) then @rows else 2" />
+                <xsl:with-param name="rows" select="if ( @rows ) then @rows else ancestor::calendar/@lectures-per-week" />
 			</xsl:call-template>
 		</common>
 		<common formats="/html/xhtml/">
 		    <xsl:if test="$numbered = 'yes'">
                 <xsl:call-template name="generate-number-cell">
                     <xsl:with-param name="colour">medgreen</xsl:with-param>
-                    <xsl:with-param name="rows" select="if ( @rows ) then @rows else 2" />
+                    <xsl:with-param name="rows" select="if ( @rows ) then @rows else ancestor::calendar/@lectures-per-week" />
                     <xsl:with-param name="number" select="1 + count( preceding::tutorial[node()] )" />
                 </xsl:call-template>
             </xsl:if>
@@ -951,7 +951,7 @@
 			<xsl:call-template name="generate-content-cell">
 				<xsl:with-param name="colour">medgreen</xsl:with-param>
 				<xsl:with-param name="columns" select="if ( $numbered = 'yes' ) then 1 else 2" />
-                <xsl:with-param name="rows" select="if ( @rows ) then @rows else 2" />
+                <xsl:with-param name="rows" select="if ( @rows ) then @rows else ancestor::calendar/@lectures-per-week" />
 			</xsl:call-template>
 		</common>
 	</template>