2 files changed, 8 insertions, 2 deletions
diff --git a/src/proc.c b/src/proc.c
index b2bbe2453..1ae1d495e 100644
--- a/src/proc.c
+++ b/src/proc.c
@@ -17,9 +17,16 @@ struct RProc *
 mrb_proc_new(mrb_state *mrb, mrb_irep *irep)
 {
   struct RProc *p;
+  mrb_callinfo *ci = mrb->c->ci;
 
   p = (struct RProc*)mrb_obj_alloc(mrb, MRB_TT_PROC, mrb->proc_class);
-  p->target_class = (mrb->c->ci) ? mrb->c->ci->target_class : 0;
+  p->target_class = 0;
+  if (ci) {
+    if (ci->proc)
+      p->target_class = ci->proc->target_class;
+    if (!p->target_class)
+      p->target_class = ci->target_class;
+  }
   p->body.irep = irep;
   p->env = 0;
   mrb_irep_incref(mrb, irep);
diff --git a/src/vm.c b/src/vm.c
index a752c698b..69f01fe1e 100644
--- a/src/vm.c
+++ b/src/vm.c
@@ -604,7 +604,6 @@ mrb_context_run(mrb_state *mrb, struct RProc *proc, mrb_value self, unsigned int
     stack_init(mrb);
   }
   stack_extend(mrb, irep->nregs, stack_keep);
-  ERR_PC_SET(mrb, pc);
   mrb->c->ci->proc = proc;
   mrb->c->ci->nregs = irep->nregs + 1;
   regs = mrb->c->stack;