1 files changed, 4 insertions, 4 deletions
diff --git a/src/SelfIvyClient.java b/src/SelfIvyClient.java
index 3e9ba6a..2cfc016 100644
--- a/src/SelfIvyClient.java
+++ b/src/SelfIvyClient.java
@@ -83,11 +83,11 @@ public class SelfIvyClient extends IvyClient {
   // unbinds to the first regexp
   protected synchronized boolean unBindMsg(String re) {
     synchronized (regexpsText) {
-      if (regexpsText.get(re) == null) return false;
-      for (Integer k :  regexpsText.keySet()) {
-	if ( (regexpsText.get(k)).compareTo(re) == 0) {
+      if (!regexpsText.containsValue(re)) return false;
+      for (Map.Entry<Integer,String> me :  regexpsText.entrySet()) {
+	if ( me.getValue().equals(re) ) {
 	  try {
-	    bus.unBindMsg(k.intValue());
+	    bus.unBindMsg(me.getKey().intValue());
 	  } catch (IvyException ie) {
 	    return false;
 	  }