diff --git a/src/dfmt/formatter.d b/src/dfmt/formatter.d
index f462b03..e4802c1 100644
--- a/src/dfmt/formatter.d
+++ b/src/dfmt/formatter.d
@@ -1574,13 +1574,6 @@ private:
             newline();
             regenLineBreakHints(index - 1);
         }
-        else if (!peekIs(tok!"}") && (linebreakHints.canFind(index)
-                || (linebreakHints.length == 0 && currentLineLength > config.max_line_length)))
-        {
-            pushWrapIndent();
-            writeToken();
-            newline();
-        }
         else if (config.dfmt_keep_line_breaks == OptionalBoolean.t)
         {
             const commaLine = tokens[index].line;
@@ -1599,6 +1592,13 @@ private:
                 }
             }
         }
+        else if (!peekIs(tok!"}") && (linebreakHints.canFind(index)
+                || (linebreakHints.length == 0 && currentLineLength > config.max_line_length)))
+        {
+            pushWrapIndent();
+            writeToken();
+            newline();
+        }
         else
         {
             writeToken();
diff --git a/tests/allman/keep_line_breaks.d.ref b/tests/allman/keep_line_breaks.d.ref
index 5ce1e26..e6b3e52 100644
--- a/tests/allman/keep_line_breaks.d.ref
+++ b/tests/allman/keep_line_breaks.d.ref
@@ -21,6 +21,10 @@ int[] func(int argument_1_1, int argument_1_2,
         .func(argument_2_1)
         .func(argument_2_2);
 
+    auto x = func(argument_1_1, argument_1_2,
+            this.argument_2_1, this.argument_2_2,
+            argument_3_1, argument_3_2);
+
     return [
         3, 5,
         5, 7,
diff --git a/tests/keep_line_breaks.d b/tests/keep_line_breaks.d
index 5ce1e26..e6b3e52 100644
--- a/tests/keep_line_breaks.d
+++ b/tests/keep_line_breaks.d
@@ -21,6 +21,10 @@ int[] func(int argument_1_1, int argument_1_2,
         .func(argument_2_1)
         .func(argument_2_2);
 
+    auto x = func(argument_1_1, argument_1_2,
+            this.argument_2_1, this.argument_2_2,
+            argument_3_1, argument_3_2);
+
     return [
         3, 5,
         5, 7,
diff --git a/tests/otbs/keep_line_breaks.d.ref b/tests/otbs/keep_line_breaks.d.ref
index 9b694f3..fd59670 100644
--- a/tests/otbs/keep_line_breaks.d.ref
+++ b/tests/otbs/keep_line_breaks.d.ref
@@ -17,6 +17,10 @@ int[] func(int argument_1_1, int argument_1_2,
         .func(argument_2_1)
         .func(argument_2_2);
 
+    auto x = func(argument_1_1, argument_1_2,
+            this.argument_2_1, this.argument_2_2,
+            argument_3_1, argument_3_2);
+
     return [
         3, 5,
         5, 7,