diff --git a/jOOQ/src/main/java/org/jooq/impl/Tools.java b/jOOQ/src/main/java/org/jooq/impl/Tools.java
index 30c869a982..c21a6d07d5 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Tools.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Tools.java
@@ -7056,13 +7056,13 @@ final class Tools {
     static final boolean containsUnaliasedTable(Table<?> in, Table<?> search) {
 
         // [#6304] [#7626] Improved alias discovery
-        return traverseJoins(in, false, r -> r, search(search, Tools::unalias));
+        return traverseJoins(in, false, r -> r, search(search, Tools::unwrap));
     }
 
     static final boolean containsUnaliasedTable(Iterable<? extends Table<?>> in, Table<?> search) {
 
         // [#6304] [#7626] Improved alias discovery
-        return traverseJoins(in, false, r -> r, search(search, Tools::unalias));
+        return traverseJoins(in, false, r -> r, search(search, Tools::unwrap));
     }
 
     static final void traverseJoins(Iterable<? extends Table<?>> i, Consumer<? super Table<?>> consumer) {