diff --git a/src/functions/oc-do-resource.cc b/src/functions/oc-do-resource.cc
index 90cdd047..51f5e28b 100644
--- a/src/functions/oc-do-resource.cc
+++ b/src/functions/oc-do-resource.cc
@@ -82,8 +82,6 @@ NAN_METHOD(bind_OCDoResource) {
 
   OCHeaderOption *options = 0;
   OCDoHandle handle;
-  OCCallbackData data = {0, defaultOCClientResponseHandler,
-                         (OCClientContextDeleter)persistentJSCallback_free};
 
   VALIDATE_ARGUMENT_COUNT(args, 9);
   VALIDATE_ARGUMENT_TYPE(args, 0, IsObject);
@@ -97,8 +95,10 @@ NAN_METHOD(bind_OCDoResource) {
   VALIDATE_ARGUMENT_TYPE_OR_NULL(args, 8, IsArray);
   VALIDATE_ARGUMENT_TYPE(args, 9, IsUint32);
 
-  data.context =
-      (void *)persistentJSCallback_new(Local<Function>::Cast(args[7]));
+  OCCallbackData data(
+    (void *)persistentJSCallback_new(Local<Function>::Cast(args[7])),
+    defaultOCClientResponseHandler,
+    (OCClientContextDeleter)persistentJSCallback_free );
 
   if (args[8]->IsArray()) {
     options = oc_header_options_new(Handle<Array>::Cast(args[8]));