diff --git a/dexlib/src/main/java/org/jf/dexlib/EncodedValue/EnumEncodedValue.java b/dexlib/src/main/java/org/jf/dexlib/EncodedValue/EnumEncodedValue.java
index 9d72064c..7cd1f45a 100644
--- a/dexlib/src/main/java/org/jf/dexlib/EncodedValue/EnumEncodedValue.java
+++ b/dexlib/src/main/java/org/jf/dexlib/EncodedValue/EnumEncodedValue.java
@@ -80,7 +80,7 @@ public class EnumEncodedValue extends EncodedValue {
     protected int compareValue(EncodedValue o) {
         EnumEncodedValue other = (EnumEncodedValue)o;
 
-        return value.getIndex() - other.value.getIndex();
+        return value.compareTo(other.value);
     }
 
     /** {@inheritDoc} */
diff --git a/dexlib/src/main/java/org/jf/dexlib/EncodedValue/FieldEncodedValue.java b/dexlib/src/main/java/org/jf/dexlib/EncodedValue/FieldEncodedValue.java
index 4d0de574..6aafc621 100644
--- a/dexlib/src/main/java/org/jf/dexlib/EncodedValue/FieldEncodedValue.java
+++ b/dexlib/src/main/java/org/jf/dexlib/EncodedValue/FieldEncodedValue.java
@@ -80,7 +80,7 @@ public class FieldEncodedValue extends EncodedValue {
     protected int compareValue(EncodedValue o) {
         FieldEncodedValue other = (FieldEncodedValue)o;
 
-        return value.getIndex()-other.value.getIndex();
+        return value.compareTo(other.value);
     }
 
     /** {@inheritDoc} */
diff --git a/dexlib/src/main/java/org/jf/dexlib/EncodedValue/MethodEncodedValue.java b/dexlib/src/main/java/org/jf/dexlib/EncodedValue/MethodEncodedValue.java
index 6267ed66..e23450a2 100644
--- a/dexlib/src/main/java/org/jf/dexlib/EncodedValue/MethodEncodedValue.java
+++ b/dexlib/src/main/java/org/jf/dexlib/EncodedValue/MethodEncodedValue.java
@@ -80,7 +80,7 @@ public class MethodEncodedValue extends EncodedValue {
     protected int compareValue(EncodedValue o) {
         MethodEncodedValue other = (MethodEncodedValue)o;
 
-        return value.getIndex() - other.value.getIndex();
+        return value.compareTo(other.value);
     }
 
     /** {@inheritDoc} */
diff --git a/dexlib/src/main/java/org/jf/dexlib/EncodedValue/StringEncodedValue.java b/dexlib/src/main/java/org/jf/dexlib/EncodedValue/StringEncodedValue.java
index d45c1060..8b323945 100644
--- a/dexlib/src/main/java/org/jf/dexlib/EncodedValue/StringEncodedValue.java
+++ b/dexlib/src/main/java/org/jf/dexlib/EncodedValue/StringEncodedValue.java
@@ -81,7 +81,7 @@ public class StringEncodedValue extends EncodedValue {
     protected int compareValue(EncodedValue o) {
         StringEncodedValue other = (StringEncodedValue)o;
 
-        return value.getIndex() - other.value.getIndex();
+        return value.compareTo(other.value);
     }
 
     /** {@inheritDoc} */
diff --git a/dexlib/src/main/java/org/jf/dexlib/EncodedValue/TypeEncodedValue.java b/dexlib/src/main/java/org/jf/dexlib/EncodedValue/TypeEncodedValue.java
index 0b5dcbb4..335aab65 100644
--- a/dexlib/src/main/java/org/jf/dexlib/EncodedValue/TypeEncodedValue.java
+++ b/dexlib/src/main/java/org/jf/dexlib/EncodedValue/TypeEncodedValue.java
@@ -80,7 +80,7 @@ public class TypeEncodedValue extends EncodedValue {
     protected int compareValue(EncodedValue o) {
         TypeEncodedValue other = (TypeEncodedValue)o;
 
-        return value.getIndex() - other.value.getIndex();
+        return value.compareTo(other.value);
     }
 
     /** {@inheritDoc} */