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 254184a2..f919d256 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,28 +45,21 @@ public class ArrayDataMethodItem extends InstructionFormatMethodItem<ArrayDataPs
 
     protected void setAttributes(StringTemplate template) {
         template.setAttribute("ElementWidth", instruction.getElementWidth());
-        template.setAttribute("Values", getValues());
+        setValuesAttribute(template);
     }
 
-    private List<ByteArray> getValues() {
-        List<ByteArray> values = new ArrayList<ByteArray>();        
+    private void setValuesAttribute(StringTemplate parentTemplate) {
         Iterator<ArrayDataPseudoInstruction.ArrayElement> iterator = instruction.getElements();
-
         while (iterator.hasNext()) {
             ArrayDataPseudoInstruction.ArrayElement element = iterator.next();
-            byte[] array = new byte[element.elementWidth];
-            System.arraycopy(element.buffer, element.bufferIndex, array, 0, element.elementWidth);
-            values.add(new ByteArray(array));
-        }
 
-        return values;
-    }
+            StringTemplate template =  parentTemplate.getGroup().getInstanceOf("ArrayElement");
 
-    public static class ByteArray
-    {
-        public final byte[] ByteArray;
-        public ByteArray(byte[] byteArray) {
-            this.ByteArray = byteArray;
+            for (int i=element.bufferIndex; i<element.bufferIndex + element.elementWidth; i++) {
+                template.setAttribute("Bytes", element.buffer[i]);
+            }
+
+            parentTemplate.setAttribute("Values", template);
         }
     }
 }
diff --git a/baksmali/src/main/resources/templates/templates/baksmali.stg b/baksmali/src/main/resources/templates/templates/baksmali.stg
index b26a4aa8..937f952c 100644
--- a/baksmali/src/main/resources/templates/templates/baksmali.stg
+++ b/baksmali/src/main/resources/templates/templates/baksmali.stg
@@ -258,10 +258,15 @@ Format51l(Opcode, Register, Literal) ::=
 ArrayData(Opcode, ElementWidth, Values) ::=
 <<
 .array-data <ElementWidth>
-    <Values: {<it.ByteArray; format="unsigned",separator=" ">}; separator="\n">
+    <Values; separator="\n">
 .end array-data
 >>
 
+ArrayElement(Bytes) ::=
+<<
+<Bytes; format="unsigned",separator=" ">
+>>
+
 PackedSwitchData(Opcode, FirstKey, Targets) ::=
 <<
 .packed-switch <FirstKey>