diff --git a/jOOQ-test/src/org/jooq/test/OracleTest.java b/jOOQ-test/src/org/jooq/test/OracleTest.java
index af17681cc0..08a4fbc045 100644
--- a/jOOQ-test/src/org/jooq/test/OracleTest.java
+++ b/jOOQ-test/src/org/jooq/test/OracleTest.java
@@ -1439,21 +1439,41 @@ xxxxxx xxxxx xxxxxxxxxx xxxxxxx xxxxxxxxxxxxxxxxx
         xxxxxxxxxxxxxxxx xxxxxx xxxxxxx xxxxxxx xx xxxxxxx xxxxxxxxxxxxxxxxxxxxxxx
     x
 
-    xxxxxx xxxxx xxxxxx x
-        xxxxxx xxxxxx xxxxxxx
-        xxxxxx xxxxxx xxx
-    x
-
     xxxxxx xxxxx xxxxxxx x
         xxxxxx xxxxxx xxxxxxx
+        xxxxxx xxxxxx xxx
+        xxxxxx xxxxxxxxx xxxxxxx
+    x
+
+    xxxxxx xxxxx xxxxxxxx x
+        xxxxxx xxxxxxx xxxxxxx
         xxxxxx xxxxxx xxxxx
         xxxxxx xxxxxx xxxxxxxx
     x
 
-    xxxxxx xxxxx xxxxxx x
+    xxxxxx xxxxx xxxxxxx x
         xxxxxx xxxxxx xxxxxxxxxx
         xxxxxx xxxxxx xxxxxxxxx
-        xxxxxx xxxxxxx xxxxxxxx
+        xxxxxx xxxxxxxx xxxxxxxx
+    x
+
+
+    xxxxxx xxxxx xxxxxxx x
+        xxxxxx xxxxxx xxxxxxx
+        xxxxxx xxxxxx xxx
+        xxxxxx xxxxxxxxxxxxx xxxxxxx
+    x
+
+    xxxxxx xxxxx xxxxxxxx x
+        xxxxxx xxxxxxx xxxxxxx
+        xxxxxx xxxxxx xxxxx
+        xxxxxx xxxxxx xxxxxxxx
+    x
+
+    xxxxxx xxxxx xxxxxxx x
+        xxxxxx xxxxxx xxxxxxxxxx
+        xxxxxx xxxxxx xxxxxxxxx
+        xxxxxx xxxxxxxx xxxxxxxx
     x
 
     xxxxx
@@ -1463,13 +1483,25 @@ xxxxxx xxxxx xxxxxxxxxx xxxxxxx xxxxxxxxxxxxxxxxx
             xxxxxxxxxxxxxxxxxxxxxxxxx
             xxxxxxxxxxxx
 
-        xxxxxx xxxxxx x xxxxxxxxxxxxxxxxxxxxxxxxxx
+        xxxxxxx xxxxxxx x xxxxxxxxxxxxxxxxxxxxxxxxxxx
+        xxxxxxxxxxxxxxxxxxxxxx xxxxxxxxxxxxxxxxxxx
         xxxxxxxxxxxxxxxxxxxxxx xxxxxxxxxxxxxxxxxx
-        xxxxxxxxxxxxxxxxxxxxxx xxxxxxxxxxxxxxxxx
-        xxxxxxxxxxxxxxxxxxxxxxxxx xxxxxxxxxxxxxxxxxxxxx
-        xxxxxxxxxxxxxxxxxxxxxxx xxxxxxxxxxxxxxxxxxxxxxxx
-        xxxxxxxxxxxxxxxxxxxxxxxx xxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-        xxxxxxxxxxxxxxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxx
+        xxxxxxxxxxxxxxxxxxxxxxxxx xxxxxxxxxxxxxxxxxxxxxx
+        xxxxxxxxxxxxxxxxxxxxxxx xxxxxxxxxxxxxxxxxxxxxxxxx
+        xxxxxxxxxxxxxxxxxxxxxxxx xxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+        xxxxxxxxxxxxxxxxxxxxxx xx xxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+        xxxxxxxxxxxxxxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxx
+
+        xxxxxxx xxxxxxx x xxxxxxxxxxxxxxxxxxxxxxxxxxx
+        xxxxxxxxxxxxxxxxxxxxxx xxxxxxxxxxxxxxxxxxx
+        xxxxxxxxxxxxxxxxxxxxxx xxxxxxxxxxxxxxxxxx
+        xxxxxxxxxxxxxxxxxxxxxxxxx xxxxxxxxxxxxxxxxxxxxxx
+        xxxxxxxxxxxxxxxxxxxxxxx xxxxxxxxxxxxxxxxxxxxxxxxx
+        xxxxxxxxxxxxxxxxxxxxxxxx xxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+        xxxxxxxxxxxxxxxxxxxxxx xx xxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+        xxxxxxxxxxxxxxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxx
+
+
     x
 
     xxxxx
@@ -1501,7 +1533,7 @@ xxxxxx xxxxx xxxxxxxxxx xxxxxxx xxxxxxxxxxxxxxxxx
             xxxxxxxxxxxxxxxxxxxxxxxxx
             xxxxxxxxxxxx
 
-        xxxxxx xxxxxx x xxxxxxxxxxxxxxxxxxxxxxxxxx
+        xxxxxxx xxxxxx x xxxxxxxxxxxxxxxxxxxxxxxxxxx
         xxxxxxxxxxxxxxxxxxxxxx xxxxxxxxxxxxxxxxxx
         xxxxxxxxxxxxxxxxxxxxxx xxxxxxxxxxxxxxxxx
         xxxxxxxxxxxxxxxxxxxxxxxxx xxxxxxxxxxxxxxxxxxxxx
diff --git a/jOOQ/src/main/java/org/jooq/tools/Convert.java b/jOOQ/src/main/java/org/jooq/tools/Convert.java
index f8ee4e4a7d..3a7aa92e5b 100644
--- a/jOOQ/src/main/java/org/jooq/tools/Convert.java
+++ b/jOOQ/src/main/java/org/jooq/tools/Convert.java
@@ -61,11 +61,13 @@ import java.util.Calendar;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashSet;
+import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Set;
 import java.util.UUID;
 import java.util.regex.Pattern;
 
+// ...
 import org.jooq.Converter;
 import org.jooq.EnumType;
 import org.jooq.Field;
@@ -751,6 +753,38 @@ public final class Convert {
                     return record.into(toClass);
                 }
 
+                /* [pro] xx
+                xx xxxxxxx xxxxxx xxxxxx x xxxxx xxxxx xxxxxx xx xxxxxxxxxxx xxxx xxxxxx xxx xxxxxxxxxxx
+                xxxx xx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx x
+                    xxxxxxxxxxxxxx xxxxxx x xxxxxxxxxxxxxxxx xxxxx
+
+                    xx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx x
+                        xxx x
+                            xxxxxxxxxxxxxxxxxx xx
+
+                            xx xxxxxxxxxxxxxxxxxxxxxxxx x
+                                x x xxxxxxxxxxxxxxxxxxxx xxxxxxxxxxxxxxxxxxxxxx
+                            x
+                            xxxx xx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx x
+                                x x xxx xxxxxxxxxxxxxxxxxxxxxxxx
+                            x
+                            xxxx x
+                                x x xxx xxxxxxxxxxxxxxxxxxxx
+                            x
+
+                            xxxxxxxxxxxxxxxxxxxxxxxxxxx
+                            xxxxxx xxx xx
+                        x
+                        xxxxx xxxxxxxxxx xx x
+                            xxxxx xxx xxxxxxxxxxxxxxxxxxxxxxxxx xxxxxxx xxxx x x xxxxxxxxx x x xx x x xxxxxxxx xxx
+                        x
+                    x
+                    xxxx x
+                        xxxxxx xxx xxxxxxxxxxxxxxxxxxxxxxxxxx xxxxxxxxx
+                    x
+                x
+                xx [/pro] */
+
                 // TODO [#2520] When RecordUnmappers are supported, they should also be considered here
             }