diff --git a/src/main/java/org/JesusFreke/dexlib/CodeItem.java b/src/main/java/org/JesusFreke/dexlib/CodeItem.java
index 3b6287c8..8923c870 100644
--- a/src/main/java/org/JesusFreke/dexlib/CodeItem.java
+++ b/src/main/java/org/JesusFreke/dexlib/CodeItem.java
@@ -491,9 +491,8 @@ public class CodeItem extends OffsettedItem<CodeItem> {
         //return the word size of the instruction list
         public int getInstructionWordCount() {
             int bytes = 0;
-            //TODO: what about option padding before the special opcodes?
             for (Instruction instruction: instructionList) {
-                bytes += instruction.getBytes().length;
+                bytes += instruction.getSize(bytes);
             }
             return bytes/2;
         }