diff --git a/src/Lean/Meta/Tactic/FunInd.lean b/src/Lean/Meta/Tactic/FunInd.lean
index 90b1adfb37..3dec7ce539 100644
--- a/src/Lean/Meta/Tactic/FunInd.lean
+++ b/src/Lean/Meta/Tactic/FunInd.lean
@@ -265,7 +265,7 @@ fails.
 partial def foldAndCollect (oldIH newIH : FVarId) (isRecCall : Expr → Option Expr) (e : Expr) : M Expr := do
   unless e.containsFVar oldIH do
     return e
-  withTraceNode `Meta.FunInd (pure m!"{exceptEmoji ·} foldAndCollect:{indentExpr e}") do
+  withTraceNode `Meta.FunInd (pure m!"{exceptEmoji ·} foldAndCollect ({mkFVar oldIH} → {mkFVar newIH})::{indentExpr e}") do
 
   let e' ← id do
     if let some (n, t, v, b) := e.letFun? then
@@ -280,7 +280,7 @@ partial def foldAndCollect (oldIH newIH : FVarId) (isRecCall : Expr → Option E
       if matcherApp.remaining.size == 1 && matcherApp.remaining[0]!.isFVarOf oldIH then
         -- We do different things to the matcher when folding recursive calls and when
         -- collecting inductive hypotheses. Therefore we do it separately,
-        -- droppin got `MetaM` in between, and using `M.eval`/`M.exec` as appropriate
+        -- dropping to `MetaM` in between, and using `M.eval`/`M.exec` as appropriate
         -- We could try to do it in one pass by breaking up the `matcherApp.transform`
         -- abstraction.
 
@@ -312,15 +312,21 @@ partial def foldAndCollect (oldIH newIH : FVarId) (isRecCall : Expr → Option E
         let ihMatcherApp'' ← ihMatcherApp'.inferMatchType
         M.tell ihMatcherApp''.toExpr
 
-        -- Folding the calls is straight forward
+        -- When folding the calls we don't want to remove the extra arg to the matcher
+        -- that was introduced in the translation
         let matcherApp' ← liftM <| matcherApp.transform
           (onParams := fun e => M.eval <| foldAndCollect oldIH newIH isRecCall e)
           (onMotive := fun _motiveArgs motiveBody => do
             let some (_extra, body) := motiveBody.arrow? | throwError "motive not an arrow"
             M.eval (foldAndCollect oldIH newIH isRecCall body))
-          (onAlt := fun _altType alt => do
-            lambdaTelescope1 alt fun oldIH alt => do
-              M.eval (foldAndCollect oldIH newIH isRecCall alt))
+          (onAlt := fun altType alt => do
+            lambdaTelescope1 alt fun oldIH' alt => do
+            -- We don't have suitable newIH around here, but we don't care since
+            -- we just want to fold calls. So lets create a fake one.
+            -- (We cannot use oldIH as that would run into the sanity checks that we could
+            -- replace all of them)
+            withLocalDeclD `fakeNewIH (← inferType (mkFVar oldIH')) fun fakeNewIH =>
+              M.eval (foldAndCollect oldIH' fakeNewIH.fvarId! isRecCall alt))
           (onRemaining := fun _ => pure #[])
         return matcherApp'.toExpr
 
diff --git a/tests/lean/run/funind_tests.lean b/tests/lean/run/funind_tests.lean
index 30c0438744..e1d704e05f 100644
--- a/tests/lean/run/funind_tests.lean
+++ b/tests/lean/run/funind_tests.lean
@@ -830,3 +830,69 @@ set_option pp.mvars false in
 #check id.mutual_induct
 
 end Mutual_Induct
+
+
+namespace MutualStructural
+
+mutual
+def map2a (f : Nat → Nat → Bool) : List Nat → List Nat → List Bool
+  | x::xs, y::ys => f x y::map2b f xs ys
+  | _, _ => []
+termination_by structural x => x
+def map2b (f : Nat → Nat → Bool) : List Nat → List Nat → List Bool
+  | x::xs, y::ys => f x y::map2a f xs ys
+  | _, _ => []
+termination_by structural x => x
+end
+
+/--
+info: MutualStructural.map2a.mutual_induct (motive_1 motive_2 : List Nat → List Nat → Prop)
+  (case1 :
+    ∀ (t : List Nat),
+      (∀ (x : List Nat),
+          match t, x with
+          | x :: xs, y :: ys => motive_2 xs ys
+          | x, x_1 => True) →
+        ∀ (x : List Nat), motive_1 t x)
+  (case2 :
+    ∀ (t : List Nat),
+      (∀ (x : List Nat),
+          match t, x with
+          | x :: xs, y :: ys => motive_2 xs ys
+          | x, x_1 => True) →
+        (∀ (x : List Nat),
+            match t, x with
+            | x :: xs, y :: ys => motive_1 xs ys
+            | x, x_1 => True) →
+          ∀ (x : List Nat), motive_2 t x) :
+  (∀ (a a_1 : List Nat), motive_1 a a_1) ∧ ∀ (a a_1 : List Nat), motive_2 a a_1
+-/
+#guard_msgs in
+#check map2a.mutual_induct
+
+/--
+info: MutualStructural.map2a.induct (motive_1 motive_2 : List Nat → List Nat → Prop)
+  (case1 :
+    ∀ (t : List Nat),
+      (∀ (x : List Nat),
+          match t, x with
+          | x :: xs, y :: ys => motive_2 xs ys
+          | x, x_1 => True) →
+        ∀ (x : List Nat), motive_1 t x)
+  (case2 :
+    ∀ (t : List Nat),
+      (∀ (x : List Nat),
+          match t, x with
+          | x :: xs, y :: ys => motive_2 xs ys
+          | x, x_1 => True) →
+        (∀ (x : List Nat),
+            match t, x with
+            | x :: xs, y :: ys => motive_1 xs ys
+            | x, x_1 => True) →
+          ∀ (x : List Nat), motive_2 t x)
+  (a✝ a✝¹ : List Nat) : motive_1 a✝ a✝¹
+-/
+#guard_msgs in
+#check map2a.induct
+
+end MutualStructural