diff --git a/src/node.cc b/src/node.cc
index bdac7400e4d..930cb81f722 100644
--- a/src/node.cc
+++ b/src/node.cc
@@ -52,10 +52,9 @@ ObjectWrap::Attach ()
 void
 ObjectWrap::Detach ()
 {
-  if (attach_count_ > 0)
-    attach_count_ -= 1;
+  if (attach_count_ > 0) attach_count_ -= 1;
 
-  if(weak_ && attach_count_ == 0) {
+  if (weak_ && attach_count_ == 0) {
     V8::AdjustAmountOfExternalAllocatedMemory(-size());
     delete this;
   }
diff --git a/src/process.cc b/src/process.cc
index 65e2c2f438f..187cbba6cb1 100644
--- a/src/process.cc
+++ b/src/process.cc
@@ -224,8 +224,6 @@ Process::Shutdown ()
   ev_child_stop(EV_DEFAULT_UC_ &child_watcher_);
   /* XXX Kill the PID? */
   pid_ = 0;
-
-  Detach();
 }
 
 static inline int
@@ -504,5 +502,6 @@ Process::MaybeShutdown (void)
     }
 
     Shutdown();
+    Detach();
   } 
 }