diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestUnfixedBugs.java b/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestUnfixedBugs.java
index 642c8ffbe..9b6b20e71 100644
--- a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestUnfixedBugs.java
+++ b/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestUnfixedBugs.java
@@ -31,6 +31,8 @@ import java.io.OutputStream;
 import java.nio.charset.Charset;
 import java.util.Calendar;
 import java.util.Date;
+import java.util.Iterator;
+import java.util.List;
 
 import org.apache.poi.hssf.HSSFTestDataSamples;
 import org.apache.poi.ss.usermodel.Cell;
@@ -391,4 +393,40 @@ public final class TestUnfixedBugs {
        assertEquals("Did not have expected contents at rownum " + rowNum, 
                contents + ".0", cell.toString());
    }
+
+   @Test
+   public void test58325_one() {
+       check58325(XSSFTestDataSamples.openSampleWorkbook("58325_lt.xlsx"), 1);
+   }
+
+   @Test
+   public void test58325_three() {
+       check58325(XSSFTestDataSamples.openSampleWorkbook("58325_db.xlsx"), 3);
+   }
+
+   private void check58325(XSSFWorkbook wb, int expectedShapes) {
+       XSSFSheet sheet = wb.getSheet("MetasNM001");
+       assertNotNull(sheet);
+
+       StringBuilder str = new StringBuilder();
+       str.append("sheet " + sheet.getSheetName() + " - ");
+
+       XSSFDrawing drawing = sheet.getDrawingPatriarch();
+       //drawing = ((XSSFSheet)sheet).createDrawingPatriarch();
+
+       List<XSSFShape> shapes = drawing.getShapes();
+       str.append("drawing.getShapes().size() = " + shapes.size());
+       Iterator<XSSFShape> it = shapes.iterator();
+       while(it.hasNext()) {           
+           XSSFShape shape = it.next();
+           str.append(", " + shape.toString());
+           str.append(", Col1:"+((XSSFClientAnchor)shape.getAnchor()).getCol1());
+           str.append(", Col2:"+((XSSFClientAnchor)shape.getAnchor()).getCol2());
+           str.append(", Row1:"+((XSSFClientAnchor)shape.getAnchor()).getRow1());
+           str.append(", Row2:"+((XSSFClientAnchor)shape.getAnchor()).getRow2());
+       }
+       
+       assertEquals("Having shapes: " + str, 
+               expectedShapes, shapes.size());
+   }
 }
diff --git a/test-data/spreadsheet/58325_db.xlsx b/test-data/spreadsheet/58325_db.xlsx
new file mode 100644
index 000000000..8b85089c8
Binary files /dev/null and b/test-data/spreadsheet/58325_db.xlsx differ
diff --git a/test-data/spreadsheet/58325_lt.xlsx b/test-data/spreadsheet/58325_lt.xlsx
new file mode 100644
index 000000000..342ad0388
Binary files /dev/null and b/test-data/spreadsheet/58325_lt.xlsx differ