diff --git a/default-recommendations/for-loop-shortcuts-test.rkt b/default-recommendations/for-loop-shortcuts-test.rkt
index ed5cafe8..d5b7a161 100644
--- a/default-recommendations/for-loop-shortcuts-test.rkt
+++ b/default-recommendations/for-loop-shortcuts-test.rkt
@@ -447,6 +447,36 @@ test: "multi-accumulator for/fold with one used result refactorable to for/fold
 ------------------------------
 
 
+test: "multi-accumulator for/fold with one used result refactorable without formatting surroundings"
+------------------------------
+(define (foo)
+  (  displayln   "foo"   )
+
+  (define-values (x y z)
+    (for/fold ([accum1 0]
+               [accum2 0]
+               [accum3 0])
+              ([n (in-naturals)])
+      (values 0 0 0)))
+
+  (*   x   2))
+------------------------------
+------------------------------
+(define (foo)
+  (  displayln   "foo"   )
+
+  (define x
+    (for/fold ([accum1 0]
+               [accum2 0]
+               [accum3 0]
+               #:result accum1)
+              ([n (in-naturals)])
+      (values 0 0 0)))
+
+  (*   x   2))
+------------------------------
+
+
 test: "for/fold with conditional body refactorable to for/fold with #:when"
 ------------------------------
 (define (foo)
diff --git a/default-recommendations/for-loop-shortcuts.rkt b/default-recommendations/for-loop-shortcuts.rkt
index f9683857..31241eeb 100644
--- a/default-recommendations/for-loop-shortcuts.rkt
+++ b/default-recommendations/for-loop-shortcuts.rkt
@@ -336,8 +336,9 @@ return just that result."
       (for-id ([accumulator-id initializer] ...
                #:result #,used-accumulator)
               loop-clauses loop-body ...))
+
   (body-before ...
-   (~replacement replacement-definition #:original original-definition)
+   (~focus-replacement-on (~replacement replacement-definition #:original original-definition))
    body-after ...))