diff --git a/‎generate/templates/partials/field_accessors.cc‎
Lines changed: 4 additions & 0 deletions b/‎generate/templates/partials/field_accessors.cc‎
Lines changed: 4 additions & 0 deletions
diff --git a/‎generate/templates/templates/struct_content.cc‎
Lines changed: 14 additions & 3 deletions b/‎generate/templates/templates/struct_content.cc‎
Lines changed: 14 additions & 3 deletions
@@ -42,6 +42,10 @@
         wrapper->raw->{{ field.name }} = {% if not field.cType | isPointer %}*{% endif %}ObjectWrap::Unwrap<{{ field.cppClassName }}>(value->ToObject())->GetValue();
 
       {% elsif field.isCallbackFunction %}
+        if (wrapper->{{ field.name }} != NULL) {
+          delete wrapper->{{ field.name }};
+        }
+
         if (value->IsFunction()) {
           if (!wrapper->raw->{{ field.name }}) {
             wrapper->raw->{{ field.name }} = ({{ field.cType }}){{ field.name }}_cppCallback;
 
@@ -41,8 +41,19 @@ using namespace std;
 }
 
 {{ cppClassName }}::~{{ cppClassName }}() {
-  // This is going to cause memory leaks. We'll have to solve that later
-  // TODO: Clean up memory better
+  {% each fields|fieldsInfo as field %}
+    {% if not field.ignore %}
+      {% if not field.isEnum %}
+        {% if field.isCallbackFunction %}
+  if (this->{{ field.name }} != NULL) {
+    delete this->{{ field.name }};
+    this->raw->{{ fields|payloadFor field.name }} = NULL;
+  }
+        {% endif %}
+      {% endif %}
+    {% endif %}
+  {% endeach %}
+
   if (this->selfFreeing) {
     free(this->raw);
   }
@@ -65,7 +76,7 @@ void {{ cppClassName }}::ConstructFields() {
           // the current instance
           this->raw->{{ field.name }} = NULL;
           this->raw->{{ fields|payloadFor field.name }} = (void *)this;
-          this->{{ field.name }} = new NanCallback();
+          this->{{ field.name }} = NULL;
         {% elsif field.payloadFor %}
 
           Local<Value> {{ field.name }} = NanUndefined();