diff --git a/src/kernel/converter.cpp b/src/kernel/converter.cpp
index 3fcf0f63a..5eea100b2 100644
--- a/src/kernel/converter.cpp
+++ b/src/kernel/converter.cpp
@@ -402,7 +402,9 @@ struct default_converter : public converter {
             if (!is_pi(s_type))
                 return false;
             expr new_s = mk_lambda(binding_name(s_type), binding_domain(s_type), mk_app(s, Var(0)), binding_info(s_type));
-            return is_def_eq(t, new_s, c, jst);
+            bool r = is_def_eq(t, new_s, c, jst);
+            if (r) scope.keep();
+            return r;
         } else {
             return false;
         }
diff --git a/src/library/unifier.cpp b/src/library/unifier.cpp
index 5f783b2bc..9bd83b4af 100644
--- a/src/library/unifier.cpp
+++ b/src/library/unifier.cpp
@@ -1554,6 +1554,8 @@ struct unifier_fn {
             if (in_conflict() && !resolve_conflict())
                 return failure();
         }
+        lean_assert(!m_tc[0]->next_cnstr());
+        lean_assert(!m_tc[1]->next_cnstr());
         lean_assert(!in_conflict());
         lean_assert(m_cnstrs.empty());
         substitution s = m_subst;
diff --git a/tests/lean/run/elab_bug1.lean b/tests/lean/run/elab_bug1.lean
new file mode 100644
index 000000000..ad608e3d6
--- /dev/null
+++ b/tests/lean/run/elab_bug1.lean
@@ -0,0 +1,71 @@
+----------------------------------------------------------------------------------------------------
+--- Copyright (c) 2014 Microsoft Corporation. All rights reserved.
+--- Released under Apache 2.0 license as described in the file LICENSE.
+--- Author: Jeremy Avigad
+----------------------------------------------------------------------------------------------------
+
+import logic
+import function
+
+using function
+
+namespace congruence
+
+-- TODO: delete this
+axiom sorry {P : Prop} : P
+
+-- TODO: move this somewhere else
+abbreviation reflexive {T : Type} (R : T → T → Type) : Prop := ∀x, R x x
+
+-- Congruence classes for unary and binary functions
+-- -------------------------------------------------
+
+inductive congruence {T1 : Type} {T2 : Type} (R1 : T1 → T1 → Prop) (R2 : T2 → T2 → Prop)
+    (f : T1 → T2) : Prop :=
+| mk : (∀x y : T1, R1 x y → R2 (f x) (f y)) → congruence R1 R2 f
+
+-- to trigger class inference
+theorem congr_app {T1 : Type} {T2 : Type} (R1 : T1 → T1 → Prop) (R2 : T2 → T2 → Prop)
+    (f : T1 → T2) {C : congruence R1 R2 f} {x y : T1} : R1 x y → R2 (f x) (f y) :=
+  congruence_rec id C x y
+
+
+-- General tools to build instances
+-- --------------------------------
+
+theorem congr_trivial [instance] {T : Type} (R : T → T → Prop) : congruence R R id :=
+mk (take x y H, H)
+
+theorem congr_const {T2 : Type} (R2 : T2 → T2 → Prop) (H : reflexive R2) :
+  ∀(T1 : Type) (R1 : T1 → T1 → Prop) (c : T2), congruence R1 R2 (const T1 c) :=
+take T1 R1 c, mk (take x y H1, H c)
+
+-- congruences for logic
+
+theorem congr_const_iff [instance] (T1 : Type) (R1 : T1 → T1 → Prop) (c : Prop) :
+  congruence R1 iff (const T1 c) := congr_const iff iff_refl T1 R1 c
+
+theorem congr_or [instance] (T : Type) (R : T → T → Prop) (f1 f2 : T → Prop)
+    (H1 : congruence R iff f1) (H2 : congruence R iff f2) :
+  congruence R iff (λx, f1 x ∨ f2 x) := sorry
+
+theorem congr_implies [instance] (T : Type) (R : T → T → Prop) (f1 f2 : T → Prop)
+    (H1 : congruence R iff f1) (H2 : congruence R iff f2) :
+  congruence R iff (λx, f1 x → f2 x) := sorry
+
+theorem congr_iff [instance] (T : Type) (R : T → T → Prop) (f1 f2 : T → Prop)
+    (H1 : congruence R iff f1) (H2 : congruence R iff f2) :
+  congruence R iff (λx, f1 x ↔ f2 x) := sorry
+
+theorem congr_not [instance] (T : Type) (R : T → T → Prop) (f : T → Prop)
+    (H : congruence R iff f) :
+  congruence R iff (λx, ¬ f x) := sorry
+
+theorem subst_iff {T : Type} {R : T → T → Prop} {P : T → Prop} {C : congruence R iff P}
+    {a b : T} (H : R a b) (H1 : P a) : P b :=
+-- iff_mp_left (congruence_rec id C a b H) H1
+iff_mp_left (@congr_app _ _ R iff P C a b H) H1
+
+theorem test2 (a b c d e : Prop) (H1 : a ↔ b) (H2 : a ∨ c → ¬(d → a)) : b ∨ c → ¬(d → b) :=
+subst_iff H1 H2
+