diff --git a/lib/src/back_end/solver.dart b/lib/src/back_end/solver.dart
index fed12f4..c890ea2 100644
--- a/lib/src/back_end/solver.dart
+++ b/lib/src/back_end/solver.dart
@@ -92,15 +92,18 @@
         debug.log('');
       }
 
-      // Since we process the solutions from lowest cost up, as soon as we find
-      // a valid one that fits, it's the best.
       if (solution.isValid) {
+        // Since we process the solutions from lowest cost up, as soon as we
+        // find a valid one that fits, it's the best.
         if (solution.overflow == 0) {
           best = solution;
           break;
         }
 
-        if (solution.overflow < best.overflow) best = solution;
+        // If not, keep track of the least-bad one we've found so far.
+        if (!best.isValid || solution.overflow < best.overflow) {
+          best = solution;
+        }
       }
 
       // Otherwise, try to expand the solution to explore different splitting
diff --git a/test/pattern/declared_variable_comment.stmt b/test/pattern/declared_variable_comment.stmt
index a4a777d..9ad71f7 100644
--- a/test/pattern/declared_variable_comment.stmt
+++ b/test/pattern/declared_variable_comment.stmt
@@ -42,7 +42,8 @@
   ;
 }
 <<<
-if (obj case final // c
+if (obj
+    case final // c
         thisIsReallyQuiteAVeryLongVariableName) {
   ;
 }