diff --git a/app/atom_main.cc b/app/atom_main.cc
index 6b817e0d69a8..2c3f998a6610 100644
--- a/app/atom_main.cc
+++ b/app/atom_main.cc
@@ -54,6 +54,7 @@ int APIENTRY wWinMain(HINSTANCE instance, HINSTANCE, wchar_t* wargv, int argc) {
       }
     }
     // Now that conversion is done, we can finally start.
+    argv[1] = argv[0];
     return node::Start(argc - 1, argv + 1);
   }
 
@@ -68,8 +69,10 @@ int APIENTRY wWinMain(HINSTANCE instance, HINSTANCE, wchar_t* wargv, int argc) {
 #include "app/atom_library_main.h"
 
 int main(int argc, const char* argv[]) {
-  if (argc > 1 && strcmp(argv[1], "--atom-child_process-fork") == 0)
+  if (argc > 1 && strcmp(argv[1], "--atom-child_process-fork") == 0) {
+    argv[1] = argv[0];
     return node::Start(argc - 1, const_cast<char**>(argv + 1));
+  }
 
   return AtomMain(argc, argv);
 }
diff --git a/vendor/node b/vendor/node
index 1383b3f5eb7a..e2f116e7877b 160000
--- a/vendor/node
+++ b/vendor/node
@@ -1 +1 @@
-Subproject commit 1383b3f5eb7a8ad385d2b408348c1bd1894bd6bf
+Subproject commit e2f116e7877b680d37b1ed534191707930684fd1