diff --git a/jOOQ/src/main/java/org/jooq/impl/ParserImpl.java b/jOOQ/src/main/java/org/jooq/impl/ParserImpl.java
index 88581f3bd4..8e72539350 100644
--- a/jOOQ/src/main/java/org/jooq/impl/ParserImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/ParserImpl.java
@@ -10627,10 +10627,7 @@ final class DefaultParseContext extends AbstractScope implements ParseContext {
             boolean both = !leading && !trailing && (parseKeywordIf("BOTH") || parseKeywordIf("B"));
 
             if (leading || trailing || both) {
-                if (parseIf(',')) {
-                    position(p);
-                }
-                else if (parseIf(')')) {
+                if (parseIf(',') || parseIf(')')) {
                     position(p);
                 }
                 else if (parseKeywordIf("FROM")) {
@@ -10643,6 +10640,17 @@ final class DefaultParseContext extends AbstractScope implements ParseContext {
                 }
             }
 
+            if (parseKeywordIf("FROM")) {
+                if (parseIf(',') || parseIf(')')) {
+                    position(p);
+                }
+                else {
+                    Field<String> f = (Field) parseField();
+                    parse(')');
+                    return trim(f);
+                }
+            }
+
             Field<String> f1 = (Field) parseField();
 
             if (parseKeywordIf("FROM")) {