diff --git a/src/modsecurity.cc b/src/modsecurity.cc
index f2daac02..ae721c9e 100644
--- a/src/modsecurity.cc
+++ b/src/modsecurity.cc
@@ -396,9 +396,8 @@ int ModSecurity::processContentOffset(const char *content, size_t len,
 
 
     yajl_gen_map_close(g);
-    yajl_gen_array_close(g);
-
     yajl_gen_map_close(g);
+
     yajl_gen_array_close(g);
     yajl_gen_map_close(g);
 
@@ -406,6 +405,7 @@ int ModSecurity::processContentOffset(const char *content, size_t len,
 
     json->assign(reinterpret_cast<const char*>(buf), jsonSize);
 
+    yajl_gen_clear(g);
     yajl_gen_free(g);
 #else
     *err = strdup("Without YAJL support, we cannot generate JSON.");