diff --git a/jOOQ/src/main/java/org/jooq/impl/SelectQueryImpl.java b/jOOQ/src/main/java/org/jooq/impl/SelectQueryImpl.java
index 1854d4be9e..3d8ee61c8e 100644
--- a/jOOQ/src/main/java/org/jooq/impl/SelectQueryImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/SelectQueryImpl.java
@@ -469,8 +469,10 @@ class SelectQueryImpl<R extends Record> extends AbstractResultQuery<R> implement
                        .keyword("for update");
 
                 if (!forUpdateOf.isEmpty()) {
-                    context.sql(' ').keyword("of").sql(' ');
-                    Utils.fieldNames(context, forUpdateOf);
+                    context.sql(' ').keyword("of")
+                           .sql(' ').visit(forUpdateOf);
+
+                    // Utils.fieldNames(context, forUpdateOf);
                 }
                 else if (!forUpdateOfTables.isEmpty()) {
                     context.sql(' ').keyword("of").sql(' ');
@@ -486,7 +488,7 @@ class SelectQueryImpl<R extends Record> extends AbstractResultQuery<R> implement
                         xxxx xxxxxxx
                         xx [/pro] */
                         case DERBY: {
-                            forUpdateOfTables.toSQLFieldNames(context);
+                            forUpdateOfTables.toSQLFields(context);
                             break;
                         }
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/TableList.java b/jOOQ/src/main/java/org/jooq/impl/TableList.java
index cae49d15f3..9da837a907 100644
--- a/jOOQ/src/main/java/org/jooq/impl/TableList.java
+++ b/jOOQ/src/main/java/org/jooq/impl/TableList.java
@@ -76,13 +76,13 @@ class TableList extends QueryPartList<Table<?>> {
      * Get a list of names of the <code>NamedQueryParts</code> contained in this
      * list.
      */
-    final void toSQLFieldNames(Context<?> ctx) {
+    final void toSQLFields(Context<?> ctx) {
         String separator = "";
 
         for (Table<?> table : this) {
             for (Field<?> field : table.fieldsRow().fields()) {
                 ctx.sql(separator);
-                ctx.literal(field.getName());
+                ctx.visit(field);
 
                 separator = ", ";
             }