diff --git a/ChangeLog b/ChangeLog
index b58963338a..93258c0686 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Mar 18 22:03:41 2014  Shota Fukumori  <her@sorah.jp>
+
+	* vm_eval.c (eval_string_with_cref): Use file path even if scope is
+	  given. Related to [ruby-core:56099] [Bug #8662] and r42103.
+
 Mon Mar 17 13:17:47 2014  Koichi Sasada  <ko1@atdot.net>
 
 	* enumerator.c (enumerator_block_call): use RARRAY_CONST_PTR()
diff --git a/test/ruby/test_method.rb b/test/ruby/test_method.rb
index 2e3c2ae8b0..f478e11486 100644
--- a/test/ruby/test_method.rb
+++ b/test/ruby/test_method.rb
@@ -660,6 +660,7 @@ class TestMethod < Test::Unit::TestCase
     assert_equal(__dir__, eval("__dir__", binding), bug8436)
     bug8662 = '[ruby-core:56099] [Bug #8662]'
     assert_equal("arbitrary", eval("__dir__", binding, "arbitrary/file.rb"), bug8662)
+    assert_equal("arbitrary", Object.new.instance_eval("__dir__", "arbitrary/file.rb"), bug8662)
   end
 
   def test_alias_owner
diff --git a/vm_eval.c b/vm_eval.c
index c3a16d1918..5ae3e78b92 100644
--- a/vm_eval.c
+++ b/vm_eval.c
@@ -1215,14 +1215,15 @@ eval_string_with_cref(VALUE self, VALUE src, VALUE scope, NODE *const cref_arg,
 	VALUE absolute_path = Qnil;
 	VALUE fname;
 
+	if (file != Qundef) {
+	    absolute_path = file;
+	}
+
 	if (scope != Qnil) {
 	    bind = Check_TypedStruct(scope, &ruby_binding_data_type);
 	    {
 		envval = bind->env;
-		if (file != Qundef) {
-		    absolute_path = file;
-		}
-		else if (!NIL_P(bind->path)) {
+		if (absolute_path == Qnil && !NIL_P(bind->path)) {
 		    file = bind->path;
 		    line = bind->first_lineno;
 		    absolute_path = rb_current_realfilepath();