diff --git a/jOOQ/src/main/java/org/jooq/impl/Tools.java b/jOOQ/src/main/java/org/jooq/impl/Tools.java
index 58acb8ca15..e42c32588e 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Tools.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Tools.java
@@ -6090,7 +6090,7 @@ final class Tools {
                 if (e instanceof AbstractRowAsField) { AbstractRowAsField<?> r = (AbstractRowAsField<?>) e;
                     List<Field<?>> result = new ArrayList<>();
 
-                    for (Field<?> field : r.fields0().fields())
+                    for (Field<?> field : flattenCollection(asList(r.fields0().fields()), removeDuplicates, flattenRowFields))
                         if (duplicates.test(field))
                             result.add(field);