diff --git a/src/addon.cpp b/src/addon.cpp
index 3793508..6d23540 100644
--- a/src/addon.cpp
+++ b/src/addon.cpp
@@ -62,19 +62,19 @@ void Main(Local<Object> exports) {
 
     /* We want this so that we can redefine process.nextTick to using the V8 native microtask queue */
     // todo: setting this might be crashing nodejs?
-    // isolate->SetMicrotasksPolicy(MicrotasksPolicy::kAuto);
+    isolate->SetMicrotasksPolicy(MicrotasksPolicy::kAuto);
 
     /* Integrate with existing libuv loop, we just pass a boolean basically */
     uWS::Loop::get((void *) 1);
 
     // instead, for now we call this manually like before:
-    uWS::Loop::get()->setPostHandler([](uWS::Loop *) {
+    /*uWS::Loop::get()->setPostHandler([](uWS::Loop *) {
         isolate->RunMicrotasks();
     });
 
     uWS::Loop::get()->setPreHandler([](uWS::Loop *) {
         isolate->RunMicrotasks();
-    });
+    });*/
 
     /* uWS namespace */
     exports->Set(String::NewFromUtf8(isolate, "App"), FunctionTemplate::New(isolate, uWS_App<uWS::App>)->GetFunction());
diff --git a/uWebSockets b/uWebSockets
index a9c9dd4..b36607d 160000
--- a/uWebSockets
+++ b/uWebSockets
@@ -1 +1 @@
-Subproject commit a9c9dd4a7df8debbdba12a2a2cd100ab6760d588
+Subproject commit b36607dac69271299db8302aafec247200a83e3d