diff --git a/src/EPPlus/Drawing/ExcelDrawing.cs b/src/EPPlus/Drawing/ExcelDrawing.cs
index 1778afb66..6707a0d5c 100644
--- a/src/EPPlus/Drawing/ExcelDrawing.cs
+++ b/src/EPPlus/Drawing/ExcelDrawing.cs
@@ -21,7 +21,6 @@ Date               Author                       Change
 using OfficeOpenXml.Utils.FileUtils;
 using OfficeOpenXml.Utils.XML;
 using System;
-using System.Drawing;
 using System.Globalization;
 using System.IO;
 using System.Linq;
@@ -583,6 +582,9 @@ internal static ExcelDrawing GetDrawing(ExcelDrawings drawings, XmlNode node, Dr
 
         internal static ExcelDrawing GetDrawingFromNode(ExcelDrawings drawings, XmlNode node, XmlElement drawNode, ExcelGroupShape parent = null, DrawingsCollectionType DrawingsType = DrawingsCollectionType.Worksheet)
         {
+            string fallbackDrawingPath = "";
+            string fallbackNvPrPath = "";
+
             switch (drawNode.LocalName)
             {
                 case "sp":
@@ -591,11 +593,19 @@ internal static ExcelDrawing GetDrawingFromNode(ExcelDrawings drawings, XmlNode
                     var aPic = new ExcelPicture(drawings, node, parent, DrawingsType);
                     return aPic;
                 case "graphicFrame":
-                    var c= ExcelChart.GetChart(drawings, node, parent);
-                    if(c!=null) //If null, the drawing is not a chart. Might be a smart art, diagram or 3d model. We return a standard drawing to retain the drawing. 
+                    var c = ExcelChart.GetChart(drawings, node, parent);
+                    if (c!=null) //If null, the drawing is not a chart. Might be a smart art, diagram or 3d model. We return a standard drawing to retain the drawing. 
                     {
                         return c;
                     }
+                    else
+                    {
+                        //While we do not know the exact type.
+                        //It's a standard drawing with a graphic frame
+                        //We assume the object has its name etc. in the same nodes as a chart
+                        fallbackDrawingPath = "xdr:graphicFrame";
+                        fallbackNvPrPath = "xdr:nvGraphicFramePr/xdr:cNvPr";
+                    }
                     break;
                 case "grpSp":
                     return new ExcelGroupShape(drawings, node, parent, DrawingsType);
@@ -644,7 +654,7 @@ internal static ExcelDrawing GetDrawingFromNode(ExcelDrawings drawings, XmlNode
                     }
                     break;
             }
-            return new ExcelDrawing(drawings, node, "", "",parent, DrawingsType);
+            return new ExcelDrawing(drawings, node, fallbackDrawingPath, fallbackNvPrPath, parent, DrawingsType);
         }
 
         private static ExcelDrawing GetShapeOrControl(ExcelDrawings drawings, XmlNode node, XmlElement drawNode, ExcelGroupShape parent, DrawingsCollectionType collectionType = DrawingsCollectionType.Worksheet)
diff --git a/src/EPPlus/Drawing/ExcelGroupShape.cs b/src/EPPlus/Drawing/ExcelGroupShape.cs
index c8a4644b2..2371c414d 100644
--- a/src/EPPlus/Drawing/ExcelGroupShape.cs
+++ b/src/EPPlus/Drawing/ExcelGroupShape.cs
@@ -47,7 +47,6 @@ private void AddDrawings()
             _groupDrawings = new List<ExcelDrawing>();
             foreach (XmlNode node in _topNode.ChildNodes)
             {
-
                 if (node.LocalName != "nvGrpSpPr" && node.LocalName != "grpSpPr")
                 {
                     var grpDraw = ExcelDrawing.GetDrawingFromNode(_parent._drawings, node, (XmlElement)node, _parent, _drawingsCollectionType);
@@ -645,6 +644,9 @@ internal override void SaveDrawing(bool hasLoadedPivotTables)
 
             foreach (var d in Drawings)
             {
+                //Ensure position on underlying drawings are updated
+                d.AdjustPositionAndSize();
+                d.UpdatePositionAndSizeXml();
                 d.SaveDrawing(hasLoadedPivotTables);
             }
         }
diff --git a/src/EPPlusTest/Issues/ChartIssues.cs b/src/EPPlusTest/Issues/ChartIssues.cs
index 0a8ff0e91..9bdf8d1f9 100644
--- a/src/EPPlusTest/Issues/ChartIssues.cs
+++ b/src/EPPlusTest/Issues/ChartIssues.cs
@@ -451,7 +451,13 @@ public void s1038()
 				//Crashes when accessesing
                 var drawingsWithinGroupShape = groupShape.Drawings;
 
-				SaveAndCleanup(package);
+				var firstDrawing = drawingsWithinGroupShape[0];
+
+                firstDrawing.SetPosition(500, 500);
+                //drawingsWithinGroupShape[0].Position.Y = 2000;
+
+
+                SaveAndCleanup(package);
             }
         }