diff --git a/ChangeLog b/ChangeLog
index 076aabf2ef..6650bf293c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Mon May 12 23:37:57 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* vm.c (collect_local_variables_in_env): remove unnecessary check
+	  which causes: x=1;proc{local_variables}.call #=> []
+
+	* test/ruby/test_variable.rb: add a test for above.
+
 Mon May 12 23:05:24 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* process.c, include/ruby/intern.h (rb_run_exec_options): externed.
diff --git a/test/ruby/test_variable.rb b/test/ruby/test_variable.rb
index 349cb05ae7..601fc21c74 100644
--- a/test/ruby/test_variable.rb
+++ b/test/ruby/test_variable.rb
@@ -59,4 +59,11 @@ class TestVariable < Test::Unit::TestCase
     lvar = 1
     assert_instance_of(Symbol, local_variables[0], "[ruby-dev:34008]")
   end
+
+  def test_local_variables2
+    x = 1
+    proc do |y|
+      assert_equal([:x, :y], local_variables.sort)
+    end.call
+  end
 end
diff --git a/vm.c b/vm.c
index 58eabf37ac..ca73e4cb59 100644
--- a/vm.c
+++ b/vm.c
@@ -280,9 +280,6 @@ static int
 collect_local_variables_in_env(rb_env_t *env, VALUE ary)
 {
     int i;
-    if (env->block.lfp == env->block.dfp) {
-	return 0;
-    }
     for (i = 0; i < env->block.iseq->local_table_size; i++) {
 	ID lid = env->block.iseq->local_table[i];
 	if (lid) {