diff --git a/src/main/java/net/onrc/onos/core/packet/LLDPOrganizationalTLV.java b/src/main/java/net/onrc/onos/core/packet/LLDPOrganizationalTLV.java
index beae222..14edd04 100644
--- a/src/main/java/net/onrc/onos/core/packet/LLDPOrganizationalTLV.java
+++ b/src/main/java/net/onrc/onos/core/packet/LLDPOrganizationalTLV.java
@@ -161,11 +161,16 @@
         if (o == this) {
             return true;
         }
-
-        if (!(o instanceof LLDPOrganizationalTLV)) {
+        if (!super.equals(o)) {
             return false;
         }
-
+        //
+        // NOTE: Subclasses are are considered as change of identity, hence
+        // equals() will return false if the class type doesn't match.
+        //
+        if (getClass() != o.getClass()) {
+            return false;
+        }
         LLDPOrganizationalTLV other = (LLDPOrganizationalTLV) o;
         if (this.type != other.type) {
             return false;
diff --git a/src/main/java/net/onrc/onos/core/packet/LLDPTLV.java b/src/main/java/net/onrc/onos/core/packet/LLDPTLV.java
index e23ce11..402a508 100644
--- a/src/main/java/net/onrc/onos/core/packet/LLDPTLV.java
+++ b/src/main/java/net/onrc/onos/core/packet/LLDPTLV.java
@@ -128,7 +128,25 @@
         if (obj == null) {
             return false;
         }
-        if (!(obj instanceof LLDPTLV)) {
+        //
+        // NOTE: Subclasses are are considered as change of identity, hence
+        // equals() will return false if the class type doesn't match.
+        //
+        // The implication is that two instances - base class and derived class
+        // will be different even if they have same bits on the wire.
+        // We use this assumption to address the fundamental
+        // "equivalence relation" issue with class inheritance and "equals()":
+        //    http://www.artima.com/lejava/articles/equality.html
+        //    http://www.angelikalanger.com/Articles/JavaSolutions/SecretsOfEquals/Equals.html
+        //
+        // Based on existing code, we don't mix the usage of based and derived
+        // class instances.
+        //
+        // Note that the fix below is different from the Floodlight fix.
+        // The Floodlight code uses "if (!(obj instanceof LLDPTLV))", but
+        // that statement breaks the "equivalence relation".
+        //
+        if (getClass() != obj.getClass()) {
             return false;
         }
         LLDPTLV other = (LLDPTLV) obj;