diff --git a/jOOQ/src/main/java/org/jooq/impl/FieldMapForUpdate.java b/jOOQ/src/main/java/org/jooq/impl/FieldMapForUpdate.java
index 458c8c0c11..7747130fa9 100644
--- a/jOOQ/src/main/java/org/jooq/impl/FieldMapForUpdate.java
+++ b/jOOQ/src/main/java/org/jooq/impl/FieldMapForUpdate.java
@@ -94,10 +94,9 @@ final class FieldMapForUpdate extends AbstractQueryPartMap<Field<?>, Field<?>> {
             boolean supportsQualify = NO_SUPPORT_QUALIFY.contains(ctx.family()) ? false : restoreQualify;
 
             for (Entry<Field<?>, Field<?>> entry : flattenEntrySet(entrySet())) {
-                ctx.sql(separator);
-
                 if (!"".equals(separator))
-                    ctx.formatNewLine();
+                    ctx.sql(separator)
+                       .formatSeparator();
 
                 ctx.start(assignmentClause)
                    .qualify(supportsQualify)
@@ -114,7 +113,7 @@ final class FieldMapForUpdate extends AbstractQueryPartMap<Field<?>, Field<?>> {
 
                 ctx.end(assignmentClause);
 
-                separator = ", ";
+                separator = ",";
             }
         }
         else {