diff --git a/jOOQ-test/src/org/jooq/test/_/testcases/FetchTests.java b/jOOQ-test/src/org/jooq/test/_/testcases/FetchTests.java
index 0e980d093d..639ac54064 100644
--- a/jOOQ-test/src/org/jooq/test/_/testcases/FetchTests.java
+++ b/jOOQ-test/src/org/jooq/test/_/testcases/FetchTests.java
@@ -995,7 +995,7 @@ extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, I, IPK, T658,
 
         assertEquals(BOOK_IDS, b.getValues(TBook_ID()));
         assertEquals(BOOK_TITLES, b.getValues(TBook_TITLE()));
-        assertTrue(TBook().getRecordType().isAssignableFrom(a.get(0).getClass()));
+        assertTrue(TBook().getRecordType().isAssignableFrom(b.get(0).getClass()));
     }
 
     @Test
diff --git a/jOOQ/src/main/java/org/jooq/impl/AbstractQueryPart.java b/jOOQ/src/main/java/org/jooq/impl/AbstractQueryPart.java
index bf31ba987b..c57065dd49 100644
--- a/jOOQ/src/main/java/org/jooq/impl/AbstractQueryPart.java
+++ b/jOOQ/src/main/java/org/jooq/impl/AbstractQueryPart.java
@@ -178,6 +178,9 @@ abstract class AbstractQueryPart implements QueryPartInternal {
 
     @Override
     public boolean equals(Object that) {
+        // This is a working default implementation. It should be overridden by
+        // concrete subclasses, to improve performance
+
         if (that instanceof QueryPart) {
             String sql1 = create().renderInlined(this);
             String sql2 = create().renderInlined((QueryPart) that);
@@ -190,6 +193,9 @@ abstract class AbstractQueryPart implements QueryPartInternal {
 
     @Override
     public int hashCode() {
+        // This is a working default implementation. It should be overridden by
+        // concrete subclasses, to improve performance
+
         return create().renderInlined(this).hashCode();
     }
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/AbstractRecord.java b/jOOQ/src/main/java/org/jooq/impl/AbstractRecord.java
index 242b2d0313..81f789eb5a 100644
--- a/jOOQ/src/main/java/org/jooq/impl/AbstractRecord.java
+++ b/jOOQ/src/main/java/org/jooq/impl/AbstractRecord.java
@@ -791,10 +791,10 @@ abstract class AbstractRecord extends AbstractStore<Object> implements Record {
         try {
             R result = Util.newRecord(table, getConfiguration());
 
-            for (Field<?> sourceField : getFields()) {
-                Field<?> targetField = result.getField(sourceField);
+            for (Field<?> targetField : table.getFields()) {
+                Field<?> sourceField = getField(targetField);
 
-                if (targetField != null) {
+                if (sourceField != null) {
                     Util.setValue(result, targetField, this, sourceField);
                 }
             }
diff --git a/jOOQ/src/main/java/org/jooq/impl/FieldList.java b/jOOQ/src/main/java/org/jooq/impl/FieldList.java
index 1ce689291d..1acd9314eb 100644
--- a/jOOQ/src/main/java/org/jooq/impl/FieldList.java
+++ b/jOOQ/src/main/java/org/jooq/impl/FieldList.java
@@ -72,11 +72,40 @@ class FieldList extends QueryPartList<Field<?>> implements FieldProvider {
             return null;
         }
 
-        return (Field<T>) getField(field.getName());
+        Field<?> result = null;
+        String name = field.getName();
+
+        for (Field<?> f1 : this) {
+            if (f1.getName().equals(name)) {
+
+                // Remember the first matching field by name
+                if (result == null) {
+                    result = f1;
+                }
+
+                // [#1802] On a colliding second matching field by name, try exact matching
+                else {
+                    for (Field<?> f2 : this) {
+                        if (f2.equals(field)) {
+                            result = f2;
+                            break;
+                        }
+                    }
+
+                    break;
+                }
+            }
+        }
+
+        return (Field<T>) result;
     }
 
     @Override
     public final Field<?> getField(String name) {
+        if (name == null) {
+            return null;
+        }
+
         for (Field<?> f : this) {
             if (f.getName().equals(name)) {
                 return f;