diff --git a/generate/templates/partials/callback_helpers.cc b/generate/templates/partials/callback_helpers.cc
index 869919d2e..0acd215ae 100644
--- a/generate/templates/partials/callback_helpers.cc
+++ b/generate/templates/partials/callback_helpers.cc
@@ -27,12 +27,6 @@
     }
   }
 
-  {% each cbFunction|returnsInfo false true as _return %}
-    {% if _return.isOutParam %}
-    *{{ _return.name }} = *baton->{{ _return.name }};
-    {% endif %}
-  {% endeach %}
-
   return baton->result;
 }
 
@@ -92,7 +86,7 @@ void {{ cppClassName }}::{{ cppFunctionName }}_{{ cbFunction.name }}_async(uv_as
       {{ _return.cppClassName }}* wrapper = Nan::ObjectWrap::Unwrap<{{ _return.cppClassName }}>(result->ToObject());
       wrapper->selfFreeing = false;
 
-      baton->{{ _return.name }} = wrapper->GetRefValue();
+      *baton->{{ _return.name }} = wrapper->GetValue();
       baton->result = {{ cbFunction.return.success }};
       {% else %}
       if (result->IsNumber()) {
@@ -126,7 +120,7 @@ void {{ cppClassName }}::{{ cppFunctionName }}_{{ cbFunction.name }}_promiseComp
         {{ _return.cppClassName }}* wrapper = Nan::ObjectWrap::Unwrap<{{ _return.cppClassName }}>(result->ToObject());
         wrapper->selfFreeing = false;
 
-        baton->{{ _return.name }} = wrapper->GetRefValue();
+        *baton->{{ _return.name }} = wrapper->GetValue();
         baton->result = {{ cbFunction.return.success }};
         {% else %}
         if (result->IsNumber()) {
diff --git a/generate/templates/partials/field_accessors.cc b/generate/templates/partials/field_accessors.cc
index 05ced5c77..17b338dc3 100644
--- a/generate/templates/partials/field_accessors.cc
+++ b/generate/templates/partials/field_accessors.cc
@@ -100,7 +100,7 @@
         uv_async_init(uv_default_loop(), &baton->req, (uv_async_cb) {{ field.name }}_async);
         {
           LockMaster::TemporaryUnlock temporaryUnlock;
-          
+
           uv_async_send(&baton->req);
 
           while(!baton->done) {
@@ -108,12 +108,6 @@
           }
         }
 
-        {% each field|returnsInfo false true as _return %}
-          {% if _return.isOutParam %}
-          *{{ _return.name }} = *baton->{{ _return.name }};
-          {% endif %}
-        {% endeach %}
-
         return baton->result;
       }
 
@@ -186,7 +180,7 @@
             {{ _return.cppClassName }}* wrapper = Nan::ObjectWrap::Unwrap<{{ _return.cppClassName }}>(result->ToObject());
             wrapper->selfFreeing = false;
 
-            baton->{{ _return.name }} = wrapper->GetRefValue();
+            *baton->{{ _return.name }} = wrapper->GetValue();
             baton->result = {{ field.return.success }};
             {% else %}
             if (result->IsNumber()) {
@@ -219,7 +213,7 @@
               {{ _return.cppClassName }}* wrapper = Nan::ObjectWrap::Unwrap<{{ _return.cppClassName }}>(result->ToObject());
               wrapper->selfFreeing = false;
 
-              baton->{{ _return.name }} = wrapper->GetRefValue();
+              *baton->{{ _return.name }} = wrapper->GetValue();
               baton->result = {{ field.return.success }};
               {% else %}
               if (result->IsNumber()) {