diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/DeployInheritInfo.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/DeployInheritInfo.java
index ef92648fb..1173b8daf 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/DeployInheritInfo.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/DeployInheritInfo.java
@@ -260,14 +260,14 @@ public final class DeployInheritInfo implements Comparable<DeployInheritInfo> {
 
   @Override
   public int compareTo(DeployInheritInfo o) {
-    if (o == this || o.discriminatorStringValue == null && discriminatorStringValue == null) {
+    if (o == this) {
       return 0;
     } else if (o.discriminatorStringValue == null) {
       return 1;
     } else if (discriminatorStringValue == null) {
       return -1;
     } else {
-      return discriminatorStringValue.compareTo(o.discriminatorStringValue);
+      return type.getName().compareTo(o.getType().getName());
     }
   }