diff --git a/nan_implementation_12_inl.h b/nan_implementation_12_inl.h
index a140f856..0cad0029 100644
--- a/nan_implementation_12_inl.h
+++ b/nan_implementation_12_inl.h
@@ -99,9 +99,16 @@ Factory<v8::Function>::New( FunctionCallback callback
     obj->SetInternalField(imp::kDataIndex, val);
   }
 
+#if defined(V8_MAJOR_VERSION) && (V8_MAJOR_VERSION > 4 ||                      \
+  (V8_MAJOR_VERSION == 4 && defined(V8_MINOR_VERSION) && V8_MINOR_VERSION >= 3))
   return scope.Escape(v8::Function::New( isolate
                           , imp::FunctionCallbackWrapper
                           , obj));
+#else
+  return Factory<v8::Function>::return_t(scope.Escape(v8::Function::New( isolate
+                          , imp::FunctionCallbackWrapper
+                          , obj)));
+#endif
 }
 
 //=== Function Template ========================================================
diff --git a/nan_implementation_pre_12_inl.h b/nan_implementation_pre_12_inl.h
index 15a815cd..013deacf 100644
--- a/nan_implementation_pre_12_inl.h
+++ b/nan_implementation_pre_12_inl.h
@@ -72,10 +72,10 @@ Factory<v8::External>::New(void * value) {
 Factory<v8::Function>::return_t
 Factory<v8::Function>::New( FunctionCallback callback
                           , v8::Local<v8::Value> data) {
-  return Factory<v8::FunctionTemplate>::New( callback
+  return Factory<v8::Function>::return_t(Factory<v8::FunctionTemplate>::New( callback
                                            , data
                                            , v8::Local<v8::Signature>()
-                                           )->GetFunction();
+                                           )->GetFunction());
 }
 
 
diff --git a/nan_new.h b/nan_new.h
index c6c4236a..f45ec74b 100644
--- a/nan_new.h
+++ b/nan_new.h
@@ -81,7 +81,7 @@ struct Factory<v8::External> : FactoryBase<v8::External> {
 };
 
 template <>
-struct Factory<v8::Function> : FactoryBase<v8::Function> {
+struct Factory<v8::Function> : MaybeFactoryBase<v8::Function> {
   static inline
   return_t
   New( FunctionCallback callback
diff --git a/test/cpp/nannew.cpp b/test/cpp/nannew.cpp
index 3934588f..29d32c73 100644
--- a/test/cpp/nannew.cpp
+++ b/test/cpp/nannew.cpp
@@ -146,9 +146,9 @@ NAN_METHOD(testFunction) {
   Tap t(info[0]);
   t.plan(2);
 
-  t.ok(_( assertType<Function>(New<Function>(testFunction))));
+  t.ok(_( assertType<Function>(New<Function>(testFunction).ToLocalChecked())));
   v8::Local<String> data = New("plonk").ToLocalChecked();
-  t.ok(_( assertType<Function>(New<Function>(testFunction, data))));
+  t.ok(_( assertType<Function>(New<Function>(testFunction, data).ToLocalChecked())));
 
   info.GetReturnValue().SetUndefined();
 }
@@ -416,7 +416,7 @@ NAN_METHOD(testRegression242) {
   // These lines must *compile*. Not much to test at runtime.
   Local<FunctionTemplate> ft = New<FunctionTemplate>(overloaded);
   (void)ft;  // not unused
-  Local<Function> f = New<Function>(overloaded);
+  Local<Function> f = New<Function>(overloaded).ToLocalChecked();
   (void)f;  // not unused
 
   t.plan(1);