diff --git a/components/fpspreadsheet/examples/excel2demo/excel2write.lpr b/components/fpspreadsheet/examples/excel2demo/excel2write.lpr
index d53cfcea6..d23f4a5b9 100644
--- a/components/fpspreadsheet/examples/excel2demo/excel2write.lpr
+++ b/components/fpspreadsheet/examples/excel2demo/excel2write.lpr
@@ -43,7 +43,7 @@ begin
   MyWorksheet.LeftPaneWidth := 1;
   MyWorksheet.TopPaneHeight := 3;
 }
-                            (*
+
   // Write some number cells
   MyWorksheet.WriteNumber(0, 0, 1.0);
   MyWorksheet.WriteUsedFormatting(0, 0, [uffBold, uffNumberFormat]);
@@ -82,7 +82,7 @@ begin
   MyWorksheet.WriteUTF8Text(1, 1, 'Second');
   MyWorksheet.WriteUTF8Text(1, 2, 'Third');
   MyWorksheet.WriteUTF8Text(1, 3, 'Fourth');
-                                         *)
+
   // Write current date/time
   MyWorksheet.WriteDateTime(2, 0, now);
 
diff --git a/components/fpspreadsheet/xlsbiff2.pas b/components/fpspreadsheet/xlsbiff2.pas
index 06ea3d4d4..c2e12d82e 100755
--- a/components/fpspreadsheet/xlsbiff2.pas
+++ b/components/fpspreadsheet/xlsbiff2.pas
@@ -876,7 +876,7 @@ begin
   //   Mask $3F: Index to XF record
   //   Mask $40: 1 = Cell is locked
   //   Mask $80: 1 = Formula is hidden
-  AStream.WriteByte(XFIndex and $3F);
+  AStream.WriteByte(Min(XFIndex, $3F) and $3F);
 
   // 2nd byte:
   //   Mask $3F: Index to FORMAT record