diff --git a/src/Lean/Meta/Match/Match.lean b/src/Lean/Meta/Match/Match.lean
index 4c5332d869..75a81ae03e 100644
--- a/src/Lean/Meta/Match/Match.lean
+++ b/src/Lean/Meta/Match/Match.lean
@@ -132,6 +132,15 @@ private def isValueTransition (p : Problem) : Bool :=
      | .var _ :: _ => true
      | _           => false
 
+private def isFinValueTransition (p : Problem) : MetaM Bool := do
+  if hasVarPattern p then return false
+  if !hasValPattern p then return false
+  p.alts.allM fun alt => do
+     match alt.patterns with
+     | .val v :: _   => return (← getFinValue? v).isSome
+     | .ctor .. :: _ => return true
+     | _             => return false
+
 private def isArrayLitTransition (p : Problem) : Bool :=
   hasArrayLitPattern p && hasVarPattern p
   && p.alts.all fun alt => match alt.patterns with
@@ -597,6 +606,19 @@ private def expandNatValuePattern (p : Problem) : MetaM Problem := do
     | _ => return alt
   return { p with alts := alts }
 
+private def expandFinValuePattern (p : Problem) : MetaM Problem := do
+  let alts ← p.alts.mapM fun alt => do
+    match alt.patterns with
+    | .val n :: ps =>
+      match (← getFinValue? n) with
+      | some ⟨n, v⟩ =>
+        let p ← mkLt (toExpr v.val) (toExpr n)
+        let h ← mkDecideProof p
+        return { alt with patterns := .ctor ``Fin.mk [] [toExpr n] [.val (toExpr v.val), .inaccessible h] :: ps }
+      | _ => return alt
+    | _ => return alt
+  return { p with alts := alts }
+
 private def traceStep (msg : String) : StateRefT State MetaM Unit := do
   trace[Meta.Match.match] "{msg} step"
 
@@ -643,6 +665,9 @@ private partial def process (p : Problem) : StateRefT State MetaM Unit := do
   else if (← isNatValueTransition p) then
     traceStep ("nat value to constructor")
     process (← expandNatValuePattern p)
+  else if (← isFinValueTransition p) then
+    traceStep ("fin value to constructor")
+    process (← expandFinValuePattern p)
   else if !isNextVar p then
     traceStep ("non variable")
     let p ← processNonVariable p
diff --git a/tests/lean/run/bv_math_lit_perf.lean b/tests/lean/run/bv_math_lit_perf.lean
index 308d5e226c..5bfe08d4f7 100644
--- a/tests/lean/run/bv_math_lit_perf.lean
+++ b/tests/lean/run/bv_math_lit_perf.lean
@@ -16,6 +16,12 @@ def f (x : BitVec 32) : Nat :=
   | 920#32 => 12
   | _      => 1000
 
+-- TODO
+theorem ex1 : f 500#32 = x := by
+  set_option trace.Meta.Tactic.simp true in
+  simp [f]
+  sorry
+
 set_option maxHeartbeats 500
 example : f 500#32 = x := by
   simp [f]
diff --git a/tests/lean/run/finLit.lean b/tests/lean/run/finLit.lean
index a32ce1c0bb..fefac94864 100644
--- a/tests/lean/run/finLit.lean
+++ b/tests/lean/run/finLit.lean
@@ -22,3 +22,11 @@ def h : Fin 15 → Nat
   | 0 => 5
   | 1 => 45
   | _ => 50
+
+def f' : Fin 2 → Nat
+  | ⟨0, _⟩ => 5
+  | ⟨1, _⟩ => 45
+
+def f'' : Fin 2 → Nat
+  | 0 => 5
+  | ⟨1, _⟩ => 45