diff --git a/dexlib/src/main/java/org/jf/dexlib/EncodedValue/ByteEncodedValue.java b/dexlib/src/main/java/org/jf/dexlib/EncodedValue/ByteEncodedValue.java
index ec8cd914..2a329330 100644
--- a/dexlib/src/main/java/org/jf/dexlib/EncodedValue/ByteEncodedValue.java
+++ b/dexlib/src/main/java/org/jf/dexlib/EncodedValue/ByteEncodedValue.java
@@ -71,7 +71,7 @@ public class ByteEncodedValue extends EncodedValue {
     protected int compareValue(EncodedValue o) {
         ByteEncodedValue other = (ByteEncodedValue)o;
 
-        return value - other.value;
+         return (value<other.value?-1:(value>other.value?1:0));
     }
 
     /** {@inheritDoc} */
diff --git a/dexlib/src/main/java/org/jf/dexlib/EncodedValue/CharEncodedValue.java b/dexlib/src/main/java/org/jf/dexlib/EncodedValue/CharEncodedValue.java
index c1740437..80d042f6 100644
--- a/dexlib/src/main/java/org/jf/dexlib/EncodedValue/CharEncodedValue.java
+++ b/dexlib/src/main/java/org/jf/dexlib/EncodedValue/CharEncodedValue.java
@@ -78,7 +78,7 @@ public class CharEncodedValue extends EncodedValue {
     protected int compareValue(EncodedValue o) {
         CharEncodedValue other = (CharEncodedValue)o;
 
-        return value - other.value;
+         return (value<other.value?-1:(value>other.value?1:0));
     }
 
     /** {@inheritDoc} */
diff --git a/dexlib/src/main/java/org/jf/dexlib/EncodedValue/IntEncodedValue.java b/dexlib/src/main/java/org/jf/dexlib/EncodedValue/IntEncodedValue.java
index e2203f29..1e96a7a3 100644
--- a/dexlib/src/main/java/org/jf/dexlib/EncodedValue/IntEncodedValue.java
+++ b/dexlib/src/main/java/org/jf/dexlib/EncodedValue/IntEncodedValue.java
@@ -76,7 +76,7 @@ public class IntEncodedValue extends EncodedValue {
     protected int compareValue(EncodedValue o) {
         IntEncodedValue other = (IntEncodedValue)o;
 
-        return value - other.value;
+        return (value<other.value?-1:(value>other.value?1:0));
     }
 
     /** {@inheritDoc} */
diff --git a/dexlib/src/main/java/org/jf/dexlib/EncodedValue/LongEncodedValue.java b/dexlib/src/main/java/org/jf/dexlib/EncodedValue/LongEncodedValue.java
index 6fd94d43..a18c4068 100644
--- a/dexlib/src/main/java/org/jf/dexlib/EncodedValue/LongEncodedValue.java
+++ b/dexlib/src/main/java/org/jf/dexlib/EncodedValue/LongEncodedValue.java
@@ -76,7 +76,7 @@ public class LongEncodedValue extends EncodedValue {
     protected int compareValue(EncodedValue o) {
         LongEncodedValue other = (LongEncodedValue)o;
 
-        return Long.signum(value - other.value);
+        return (value<other.value?-1:(value>other.value?1:0));
     }
 
     /** {@inheritDoc} */
diff --git a/dexlib/src/main/java/org/jf/dexlib/EncodedValue/ShortEncodedValue.java b/dexlib/src/main/java/org/jf/dexlib/EncodedValue/ShortEncodedValue.java
index 2cbc2235..e038ed23 100644
--- a/dexlib/src/main/java/org/jf/dexlib/EncodedValue/ShortEncodedValue.java
+++ b/dexlib/src/main/java/org/jf/dexlib/EncodedValue/ShortEncodedValue.java
@@ -76,7 +76,7 @@ public class ShortEncodedValue extends EncodedValue {
     protected int compareValue(EncodedValue o) {
         ShortEncodedValue other = (ShortEncodedValue)o;
 
-        return value - other.value;
+         return (value<other.value?-1:(value>other.value?1:0));
     }
 
     /** {@inheritDoc} */