diff --git a/jOOQ/src/main/java/org/jooq/impl/TableFieldImpl.java b/jOOQ/src/main/java/org/jooq/impl/TableFieldImpl.java
index 370b4d32f8..1c26baab67 100644
--- a/jOOQ/src/main/java/org/jooq/impl/TableFieldImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/TableFieldImpl.java
@@ -51,6 +51,7 @@ import org.jooq.Name;
 import org.jooq.Record;
 import org.jooq.Table;
 import org.jooq.TableField;
+import org.jooq.tools.StringUtils;
 
 /**
  * A common base type for table fields.
@@ -111,7 +112,9 @@ final class TableFieldImpl<R extends Record, T> extends AbstractField<T> impleme
         // rather expensive implementation of AbstractQueryPart.equals()
         if (that instanceof TableField) {
             TableField<?, ?> other = (TableField<?, ?>) that;
-            return getQualifiedName().equals(other.getQualifiedName());
+            return
+                StringUtils.equals(getTable(), other.getTable()) &&
+                StringUtils.equals(getName(), other.getName());
         }
 
         return super.equals(that);