diff --git a/ircd/exec.cc b/ircd/exec.cc
index 7575b2bf6..ecf96a464 100644
--- a/ircd/exec.cc
+++ b/ircd/exec.cc
@@ -149,7 +149,12 @@ try
 		sig,
 	};
 
-	child->wait();
+	//child->wait();
+	dock.wait([this]
+	{
+		return this->pid <= 0;
+	});
+
 	assert(!child->running());
 	return code;
 }