diff --git a/jOOQ/src/main/java/org/jooq/impl/ParserImpl.java b/jOOQ/src/main/java/org/jooq/impl/ParserImpl.java
index c33f1b85e5..af1a725fe1 100644
--- a/jOOQ/src/main/java/org/jooq/impl/ParserImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/ParserImpl.java
@@ -4263,7 +4263,7 @@ final class ParserImpl implements Parser {
             do {
                 parseAlterTableAddFieldsOrConstraints(ctx, list);
             }
-            while (parseIf(ctx, ',') && parseKeyword(ctx, "ADD"));
+            while (parseIf(ctx, ',') && (parseKeywordIf(ctx, "ADD") || !peekKeyword(ctx, "ALTER", "COMMENT", "DROP", "MODIFY", "OWNER TO", "RENAME")));
         }
 
         if (list.size() == 1)