diff --git a/src/node_script.cc b/src/node_script.cc
index ce7761d0c26..c91ca4a3b4f 100644
--- a/src/node_script.cc
+++ b/src/node_script.cc
@@ -297,7 +297,7 @@ Handle<Value> WrappedScript::EvalMachine(const Arguments& args) {
   }
 
   const int filename_index = sandbox_index +
-                             (context_flag == newContext ? 1 : 0);
+                             ((context_flag == newContext || context_flag == userContext)? 1 : 0);
   Local<String> filename = args.Length() > filename_index
                            ? args[filename_index]->ToString()
                            : String::New("evalmachine.<anonymous>");