diff --git a/src/scratchpad/src/org/apache/poi/hdgf/chunks/Chunk.java b/src/scratchpad/src/org/apache/poi/hdgf/chunks/Chunk.java
index 595ca9ad92..fc880d5db3 100644
--- a/src/scratchpad/src/org/apache/poi/hdgf/chunks/Chunk.java
+++ b/src/scratchpad/src/org/apache/poi/hdgf/chunks/Chunk.java
@@ -116,7 +116,7 @@ public final class Chunk {
 
 		// Loop over the definitions, building the commands
 		//  and getting their values
-		ArrayList commands = new ArrayList();
+		ArrayList<Command> commands = new ArrayList<Command>();
 		for(int i=0; i<commandDefinitions.length; i++) {
 			int type = commandDefinitions[i].getType();
 			int offset = commandDefinitions[i].getOffset();
@@ -232,7 +232,7 @@ public final class Chunk {
 		}
 
 		// Save the commands we liked the look of
-		this.commands = (Command[])commands.toArray(
+		this.commands = commands.toArray(
 							new Command[commands.size()] );
 
 		// Now build up the blocks, if we had a command that tells
diff --git a/src/scratchpad/testcases/org/apache/poi/hdgf/TestHDGFCore.java b/src/scratchpad/testcases/org/apache/poi/hdgf/TestHDGFCore.java
index 67a4141768..3a571b8edc 100644
--- a/src/scratchpad/testcases/org/apache/poi/hdgf/TestHDGFCore.java
+++ b/src/scratchpad/testcases/org/apache/poi/hdgf/TestHDGFCore.java
@@ -77,4 +77,17 @@ public final class TestHDGFCore extends TestCase {
 		hdgf = new HDGFDiagram(fs);
 		assertNotNull(hdgf);
 	}
+	
+	/**
+	 * Tests that we can open a problematic file that triggers
+	 *  an ArrayIndexOutOfBoundsException when processing the
+	 *  chunk commands.
+	 * @throws Exception
+	 */
+	public void DISABLEDtestAIOOB() throws Exception {
+      fs = new POIFSFileSystem(_dgTests.openResourceAsStream("44501.vsd"));
+
+      HDGFDiagram hdgf = new HDGFDiagram(fs);
+      assertNotNull(hdgf);
+	}
 }
diff --git a/test-data/diagram/44501.vsd b/test-data/diagram/44501.vsd
new file mode 100644
index 0000000000..51de23a325
Binary files /dev/null and b/test-data/diagram/44501.vsd differ