diff --git a/codechicken/lib/asm/ASMReader.java b/codechicken/lib/asm/ASMReader.java
index c040935..e43de99 100644
--- a/codechicken/lib/asm/ASMReader.java
+++ b/codechicken/lib/asm/ASMReader.java
@@ -305,7 +305,10 @@ public class ASMReader
                             break;
                             case FIELD_INSN:
                             case METHOD_INSN:
-                                insn = ObfMapping.fromDesc(split[1]).toInsn(opcode);
+                                StringBuilder sb = new StringBuilder();
+                                for(int i = 1; i < split.length; i++)
+                                    sb.append(split[i]);
+                                insn = ObfMapping.fromDesc(sb.toString()).toInsn(opcode);
                             break;
                             case INVOKE_DYNAMIC_INSN:
                                 throw new Exception("Found INVOKEDYNAMIC while reading");
diff --git a/codechicken/lib/colour/Colour.java b/codechicken/lib/colour/Colour.java
index 8960c07..41cf7a3 100644
--- a/codechicken/lib/colour/Colour.java
+++ b/codechicken/lib/colour/Colour.java
@@ -138,4 +138,9 @@ public abstract class Colour
         a = colour.a;
         return this;
     }
+
+    public boolean equals(Colour colour)
+    {
+        return colour != null && rgba() == colour.rgba();
+    }
 }