diff --git a/ChangeLog b/ChangeLog
index af1d295f1d..3a8ba7da89 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sat Jun 16 18:31:46 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval.c (ruby_setup): set running state in the normal case before
+	  popping a tag.
+
 Sat Jun 16 07:46:03 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* lib/test/unit.rb (Test::Unit::Runner#_run_parallel): format workers
diff --git a/eval.c b/eval.c
index cc16e393e8..0d9942ff00 100644
--- a/eval.c
+++ b/eval.c
@@ -53,10 +53,10 @@ ruby_setup(void)
     if ((state = EXEC_TAG()) == 0) {
 	rb_call_inits();
 	ruby_prog_init();
+	GET_VM()->running = 1;
     }
     POP_TAG();
 
-    if (!state) GET_VM()->running = 1;
     return state;
 }