diff --git a/dexlib/src/main/java/org/jf/dexlib/ClassDataItem.java b/dexlib/src/main/java/org/jf/dexlib/ClassDataItem.java
index 45d35bae..c4750031 100644
--- a/dexlib/src/main/java/org/jf/dexlib/ClassDataItem.java
+++ b/dexlib/src/main/java/org/jf/dexlib/ClassDataItem.java
@@ -389,7 +389,7 @@ public class ClassDataItem extends Item<ClassDataItem> {
             this.accessFlags = accessFlags;
             this.codeItem = codeItem;
             if (codeItem != null) {
-                codeItem.setParent(method);
+                codeItem.setParent(this);
             }   
         }
 
@@ -408,7 +408,7 @@ public class ClassDataItem extends Item<ClassDataItem> {
             accessFlags = in.readUnsignedLeb128();
             codeItem = (CodeItem)readContext.getOffsettedItemByOffset(ItemType.TYPE_CODE_ITEM, in.readUnsignedLeb128());
             if (codeItem != null) {
-                codeItem.setParent(method);
+                codeItem.setParent(this);
             }
         }
 
diff --git a/dexlib/src/main/java/org/jf/dexlib/CodeItem.java b/dexlib/src/main/java/org/jf/dexlib/CodeItem.java
index 6ff588df..04387a49 100644
--- a/dexlib/src/main/java/org/jf/dexlib/CodeItem.java
+++ b/dexlib/src/main/java/org/jf/dexlib/CodeItem.java
@@ -47,7 +47,7 @@ public class CodeItem extends Item<CodeItem> {
     private TryItem[] tries;
     private EncodedCatchHandler[] encodedCatchHandlers;
 
-    private MethodIdItem parent;
+    private ClassDataItem.EncodedMethod parent;
     
     /**
      * Creates a new uninitialized <code>CodeItem</code>
@@ -274,7 +274,7 @@ public class CodeItem extends Item<CodeItem> {
         if (other.parent == null) {
             return 1;
         }
-        return parent.compareTo(other.parent);
+        return parent.method.compareTo(other.parent.method);
     }
 
     /**
@@ -307,17 +307,17 @@ public class CodeItem extends Item<CodeItem> {
 
     /**
      * Sets the <code>MethodIdItem</code> of the method that this <code>CodeItem</code> is associated with
-     * @param methodIdItem the <code>MethodIdItem</code> of the method that this <code>CodeItem</code> is associated
+     * @param encodedMethod the <code>EncodedMethod</code> of the method that this <code>CodeItem</code> is associated
      * with
      */
-    protected void setParent(MethodIdItem methodIdItem) {
-        this.parent = methodIdItem;
+    protected void setParent(ClassDataItem.EncodedMethod encodedMethod) {
+        this.parent = encodedMethod;
     }
 
     /**
      * @return the MethodIdItem of the method that this CodeItem belongs to
      */
-    public MethodIdItem getParent() {
+    public ClassDataItem.EncodedMethod getParent() {
         return parent;
     }