diff --git a/ChangeLog b/ChangeLog
index b654e20cb9..503ee17bba 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Tue Dec 25 05:24:12 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* compile.c (iseq_compile): clear local table if node == 0.
+	  a patch from Yusuke ENDOH <mame AT tsg.ne.jp>
+
+	* vm.c: clear VM stack.
+
 Tue Dec 25 04:23:32 2007  Tanaka Akira  <akr@fsij.org>
 
 	* parse.y (rb_id2str): fill klass of returned string as rb_cString.
diff --git a/compile.c b/compile.c
index a3dea41793..22f5c6260a 100644
--- a/compile.c
+++ b/compile.c
@@ -145,6 +145,7 @@ iseq_compile(VALUE self, NODE *node)
 
     if (node == 0) {
 	COMPILE(ret, "nil", node);
+	iseq_set_local_table(iseq, 0);
     }
     else if (nd_type(node) == NODE_SCOPE) {
 	/* iseq type of top, method, class, block */
diff --git a/vm.c b/vm.c
index 9eda8014c0..3fa51c27f5 100644
--- a/vm.c
+++ b/vm.c
@@ -1664,10 +1664,15 @@ th_init2(rb_thread_t *th)
     th->stack = thread_recycle_stack(th->stack_size);
 
     th->cfp = (void *)(th->stack + th->stack_size);
-    th->cfp--;
 
+    vm_push_frame(th, 0, FRAME_MAGIC_TOP, Qnil, 0, 0,
+		  th->stack, 0, 0);
+    vm_push_frame(th, 0, FRAME_MAGIC_TOP, Qnil, 0, 0,
+		  th->cfp->sp, 0, 0);
+    
+#if 0
     th->cfp->pc = 0;
-    th->cfp->sp = th->stack + 1;
+    th->cfp->sp = th->stack;
     th->cfp->bp = 0;
     th->cfp->lfp = th->stack;
     *th->cfp->lfp = 0;
@@ -1677,6 +1682,7 @@ th_init2(rb_thread_t *th)
     th->cfp->iseq = 0;
     th->cfp->proc = 0;
     th->cfp->block_iseq = 0;
+#endif
 
     th->status = THREAD_RUNNABLE;
     th->errinfo = Qnil;
@@ -1847,6 +1853,8 @@ Init_BareVM(void)
     rb_thread_t *th = ALLOC(rb_thread_t);
     MEMZERO(th, rb_thread_t, 1);
 
+    rb_thread_set_current_raw(th);
+
     vm_init2(vm);
     ruby_current_vm = vm;
 
@@ -1859,7 +1867,6 @@ Init_BareVM(void)
     th->machine_stack_maxsize /= 2;
     th->machine_register_stack_maxsize = th->machine_stack_maxsize;
 #endif
-    rb_thread_set_current_raw(th);
 }
 
 /* top self */