diff --git a/jOOQ/src/main/java/org/jooq/impl/AbstractSelect.java b/jOOQ/src/main/java/org/jooq/impl/AbstractSelect.java
index a0709c43c9..2f8560d9d2 100644
--- a/jOOQ/src/main/java/org/jooq/impl/AbstractSelect.java
+++ b/jOOQ/src/main/java/org/jooq/impl/AbstractSelect.java
@@ -133,6 +133,9 @@ abstract class AbstractSelect<R extends Record> extends AbstractResultQuery<R> i
 
     @Override
     protected final List<Field<?>> getFields(ResultSetMetaData meta) {
+
+        // [#1808] TODO: Restrict this field list, in case a restricting fetch()
+        // method was called to get here
     	List<Field<?>> select = getSelect();
 
     	// If no projection was specified explicitly, create fields from result