diff --git a/src/gov/nist/core/HostPort.java b/src/gov/nist/core/HostPort.java
index 8dec69f1e..f1c3853bc 100755
--- a/src/gov/nist/core/HostPort.java
+++ b/src/gov/nist/core/HostPort.java
@@ -89,7 +89,7 @@ public boolean equals(Object other) {
             return false;
         }
         HostPort that = (HostPort) other;
-        return port == that.port && host.equals(that.host);
+        return port == this.encode().equals(that.encode());
     }
 
     /** get the Host field