diff --git a/baksmali/src/main/java/org/jf/baksmali/Adaptors/Format/ArrayDataMethodItem.java b/baksmali/src/main/java/org/jf/baksmali/Adaptors/Format/ArrayDataMethodItem.java
index 30bbc84e..12d9aaa8 100644
--- a/baksmali/src/main/java/org/jf/baksmali/Adaptors/Format/ArrayDataMethodItem.java
+++ b/baksmali/src/main/java/org/jf/baksmali/Adaptors/Format/ArrayDataMethodItem.java
@@ -45,8 +45,8 @@ public class ArrayDataMethodItem extends InstructionFormatMethodItem<ArrayDataPs
         return instruction.getElementWidth();
     }
 
-    public Iterator<byte[]> getValues() {
-        return new Iterator<byte[]>() {
+    public Iterator<ByteArray> getValues() {
+        return new Iterator<ByteArray>() {
             int position;
             final Iterator<ArrayDataPseudoInstruction.ArrayElement> iterator = instruction.getElements();
 
@@ -54,15 +54,23 @@ public class ArrayDataMethodItem extends InstructionFormatMethodItem<ArrayDataPs
                 return iterator.hasNext();                
             }
 
-            public byte[] next() {
+            public ByteArray next() {
                 ArrayDataPseudoInstruction.ArrayElement element = iterator.next();
                 byte[] array = new byte[element.elementWidth];
                 System.arraycopy(element.buffer, element.bufferIndex, array, 0, element.elementWidth);
-                return array;
+                return new ByteArray(array);
             }
 
             public void remove() {
             }
         };
     }
+
+    public static class ByteArray
+    {
+        public final byte[] ByteArray;
+        public ByteArray(byte[] byteArray) {
+            this.ByteArray = byteArray;
+        }
+    }
 }
diff --git a/baksmali/src/main/resources/templates/templates/baksmali.stg b/baksmali/src/main/resources/templates/templates/baksmali.stg
index 43e47ba5..2c6bce37 100644
--- a/baksmali/src/main/resources/templates/templates/baksmali.stg
+++ b/baksmali/src/main/resources/templates/templates/baksmali.stg
@@ -262,7 +262,7 @@ Format51l(Instruction) ::=
 ArrayData(Instruction) ::=
 <<
 .array-data <Instruction.ElementWidth>
-    <Instruction.Values: {<it; format="unsigned",separator=" ">}; separator="\n">
+    <Instruction.Values: {<it.ByteArray; format="unsigned",separator=" ">}; separator="\n">
 .end array-data
 >>