diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/XLWorkbook_Load.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/XLWorkbook_Load.cs
index 63bc30d..ab65137 100644
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/XLWorkbook_Load.cs
+++ b/ClosedXML/ClosedXML/ClosedXML/Excel/XLWorkbook_Load.cs
@@ -331,7 +331,7 @@
                         if (xml != null)
                             shape = xml.Elements().First(e => (string)e.Attribute("type") == "#_x0000_t202");
                         else
-                            shape = xdoc.Root.Elements().First(e => (string)e.Attribute("type") == "#_x0000_t202");
+                            shape = xdoc.Root.Elements().First(e => (string)e.Attribute("type") == "#_x0000_t202" || (string)e.Attribute("type") == "#_xssf_cell_comment");
 
                         LoadShapeProperties<IXLComment>(xlComment, shape);
 
diff --git a/ClosedXML/ClosedXML/ClosedXML_Sandbox/Program.cs b/ClosedXML/ClosedXML/ClosedXML_Sandbox/Program.cs
index 46b1c77..8a4d266 100644
--- a/ClosedXML/ClosedXML/ClosedXML_Sandbox/Program.cs
+++ b/ClosedXML/ClosedXML/ClosedXML_Sandbox/Program.cs
@@ -12,18 +12,9 @@
     {
         static void Main(string[] args)
         {
-            var wb = new XLWorkbook();
+            var wb = new XLWorkbook(@"C:\Temp\tables1.xlsx");
+            wb.SaveAs(@"C:\Temp\tables_saved.xlsx");
             
-            foreach (var wsNum in Enumerable.Range(1, 5))
-            {
-                var ws = wb.AddWorksheet(wsNum.ToString());
-                var rowNum = Math.Pow(10, wsNum);
-                var start = DateTime.Now;
-                ws.FirstRow().InsertRowsBelow((int)rowNum);
-                var end = DateTime.Now;
-
-                Console.WriteLine(rowNum + " rows in " + (end - start).TotalSeconds + " seconds.");
-            }
             Console.ReadKey();
         }
     }