diff --git a/main/HSSF/Model/InternalSheet.cs b/main/HSSF/Model/InternalSheet.cs
index d05ad67a2..25c471955 100644
--- a/main/HSSF/Model/InternalSheet.cs
+++ b/main/HSSF/Model/InternalSheet.cs
@@ -2022,15 +2022,15 @@ public bool IsUncalced
         /// If requested, will Create a new DrawRecord if none currently exist
         /// </summary>
         /// <param name="drawingManager">The DrawingManager2 for our workbook</param>
-        /// <param name="CreateIfMissing">Should one be Created if missing?</param>
+        /// <param name="createIfMissing">Should one be Created if missing?</param>
         /// <returns>location of EscherAggregate record. if no EscherAggregate record is found return -1</returns>
-        public int AggregateDrawingRecords(DrawingManager2 drawingManager, bool CreateIfMissing)
+        public int AggregateDrawingRecords(DrawingManager2 drawingManager, bool createIfMissing)
         {
             int loc = FindFirstRecordLocBySid(DrawingRecord.sid);
             bool noDrawingRecordsFound = (loc == -1);
             if (noDrawingRecordsFound)
             {
-                if (!CreateIfMissing)
+                if (!createIfMissing)
                 {
                     // None found, and not allowed to Add in
                     return -1;
diff --git a/main/HSSF/UserModel/HSSFSheet.cs b/main/HSSF/UserModel/HSSFSheet.cs
index 667957c5c..e7ee3126f 100644
--- a/main/HSSF/UserModel/HSSFSheet.cs
+++ b/main/HSSF/UserModel/HSSFSheet.cs
@@ -3401,6 +3401,15 @@ public ICellRange<ICell> GetCells(string range)
                 firstRow = startCellAddress.Row;
                 height = rangeAddress.Height;
                 width = rangeAddress.Width;
+                for(int i = firstRow; i < height; i++)
+                {
+                    for(int j = firstColumn; j < width; j++)
+                    {
+                        var row = this.GetRow(i) ?? CreateRow(i);
+                        var cell = row.GetCell(j) ?? row.CreateCell(j);
+                        cells.Add(cell);
+                    }
+                }
             }
             else
             {