diff --git a/jOOQ/src/main/java/org/jooq/CreateTableCommentStep.java b/jOOQ/src/main/java/org/jooq/CreateTableCommentStep.java
index e7d72d3d90..9feea2d506 100644
--- a/jOOQ/src/main/java/org/jooq/CreateTableCommentStep.java
+++ b/jOOQ/src/main/java/org/jooq/CreateTableCommentStep.java
@@ -39,6 +39,7 @@ package org.jooq;
 
 import static org.jooq.SQLDialect.MARIADB;
 import static org.jooq.SQLDialect.MYSQL;
+// ...
 import static org.jooq.SQLDialect.POSTGRES;
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/impl/CreateTableImpl.java b/jOOQ/src/main/java/org/jooq/impl/CreateTableImpl.java
index 7dc78aab6c..65498f60f1 100644
--- a/jOOQ/src/main/java/org/jooq/impl/CreateTableImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/CreateTableImpl.java
@@ -131,6 +131,7 @@ final class CreateTableImpl<R extends Record> extends AbstractQuery implements
 
 
 
+
     private final Table<?>                   table;
     private Select<?>                        select;
     private Boolean                          withData;
@@ -303,10 +304,36 @@ final class CreateTableImpl<R extends Record> extends AbstractQuery implements
     private final void accept0(Context<?> ctx) {
         if (comment != null && EMULATE_COMMENT_IN_BLOCK.contains(ctx.family())) {
             begin(ctx);
+
+
+
+
+
+
             accept1(ctx);
 
-            ctx.sql(';').formatSeparator()
-               .visit(commentOnTable(table).is(comment)).sql(';');
+
+
+
+
+
+            ctx.sql(';');
+
+            ctx.formatSeparator();
+
+
+
+
+
+
+            ctx.visit(commentOnTable(table).is(comment));
+
+
+
+
+
+
+            ctx.sql(';');
 
             end(ctx);
             return;