diff --git a/src/zcl_excel_writer_huge_file.clas.abap b/src/zcl_excel_writer_huge_file.clas.abap
index 46e28e9..d97dffa 100644
--- a/src/zcl_excel_writer_huge_file.clas.abap
+++ b/src/zcl_excel_writer_huge_file.clas.abap
@@ -249,7 +249,6 @@ CLASS zcl_excel_writer_huge_file IMPLEMENTATION.
           draft              TYPE c,
           errors             TYPE string,
           firstpagenumber    TYPE i,
-          fittopage          TYPE c,
           fittoheight        TYPE i,
           fittowidth         TYPE i,
           horizontaldpi      TYPE i,
@@ -676,7 +675,6 @@ CLASS zcl_excel_writer_huge_file IMPLEMENTATION.
     l_worksheet-pagesetup-cellcomments       = io_worksheet->sheet_setup->cell_comments.
     l_worksheet-pagesetup-copies             = io_worksheet->sheet_setup->copies.
     l_worksheet-pagesetup-firstpagenumber    = io_worksheet->sheet_setup->first_page_number.
-    l_worksheet-pagesetup-fittopage          = io_worksheet->sheet_setup->fit_to_page.
     l_worksheet-pagesetup-fittoheight        = io_worksheet->sheet_setup->fit_to_height.
     l_worksheet-pagesetup-fittowidth         = io_worksheet->sheet_setup->fit_to_width.
     l_worksheet-pagesetup-horizontaldpi      = io_worksheet->sheet_setup->horizontal_dpi.
diff --git a/src/zexcel_tr_sheet.xslt.source.xml b/src/zexcel_tr_sheet.xslt.source.xml
index ba1f533..e7bd3ee 100644
--- a/src/zexcel_tr_sheet.xslt.source.xml
+++ b/src/zexcel_tr_sheet.xslt.source.xml
@@ -27,12 +27,12 @@
           <tt:attribute name="summaryRight" value-ref="WORKSHEET.SUMMARYRIGHT" />
           <tt:attribute name="summaryBelow" value-ref="WORKSHEET.SUMMARYBELOW" />
         </outlinePr>
+        <tt:cond check="not-initial(WORKSHEET.FITTOPAGE)">
+          <pageSetUpPr>
+            <tt:attribute name="fitToPage" value-ref="WORKSHEET.FITTOPAGE"/>
+          </pageSetUpPr>
+        </tt:cond>
       </sheetPr>
-      <tt:cond check="not-initial(WORKSHEET.FITTOPAGE)">
-        <pageSetupPr>
-          <tt:attribute name="fitToPage" value-ref="WORKSHEET.FITTOPAGE" />
-        </pageSetupPr>
-      </tt:cond>
       <dimension>
         <tt:attribute name="ref" value-ref="WORKSHEET.DIMENSION" />
       </dimension>
@@ -112,8 +112,8 @@
               <tt:attribute name="hidden"       value-ref="HIDDEN"       />
             </tt:cond>
             <tt:cond check="not-initial(CUSTOMHEIGHT)">
-              <tt:attribute name="customHeight" value-ref="CUSTOMHIGHT"  />
-              <tt:attribute name="ht"           value-ref="HIGHT"        />
+              <tt:attribute name="customHeight" value-ref="CUSTOMHEIGHT" />
+              <tt:attribute name="ht"           value-ref="HEIGHT"       />
             </tt:cond>
             <tt:cond check="not-initial(COLLAPSED)">
               <tt:attribute name="collapsed"    value-ref="COLLAPSED"    />
@@ -229,8 +229,8 @@
           <tt:cond check="FIRSTPAGENUMBER != 0">
             <tt:attribute name="firstPageNumber"    value-ref="FIRSTPAGENUMBER"    />
           </tt:cond>
-          <tt:cond check="not-initial(FITTOPAGE)">
-            <tt:attribute name="fitToHeight"        value-ref="FITTOHIGHT"         />
+          <tt:cond check="not-initial(ref('.WORKSHEET.FITTOPAGE'))">
+            <tt:attribute name="fitToHeight"        value-ref="FITTOHEIGHT"        />
             <tt:attribute name="fitToWidth"         value-ref="FITTOWIDTH"         />
           </tt:cond>
           <tt:cond check="HORIZONTALDPI != 0">