diff --git a/src/ecmascript/quickjs/document.c b/src/ecmascript/quickjs/document.c
index 9982c85f..631e1725 100644
--- a/src/ecmascript/quickjs/document.c
+++ b/src/ecmascript/quickjs/document.c
@@ -1692,7 +1692,11 @@ js_document_querySelectorAll(JSContext *ctx, JSValueConst this_val, int argc, JS
 	JS_FreeCString(ctx, selector);
 	//dom_node_unref(doc);
 
-	return getNodeList2(ctx, result_list);
+	JSValue rr = getNodeList2(ctx, result_list);
+	free_list(*result_list);
+	mem_free(result_list);
+
+	return rr;
 }
 
 #if 0
diff --git a/src/ecmascript/quickjs/element.c b/src/ecmascript/quickjs/element.c
index be605670..78e3d97f 100644
--- a/src/ecmascript/quickjs/element.c
+++ b/src/ecmascript/quickjs/element.c
@@ -3289,7 +3289,11 @@ js_element_querySelectorAll(JSContext *ctx, JSValueConst this_val, int argc, JSV
 	JS_FreeCString(ctx, selector);
 	//dom_node_unref(el);
 
-	return getNodeList2(ctx, result_list);
+	JSValue rr = getNodeList2(ctx, result_list);
+	free_list(*result_list);
+	mem_free(result_list);
+
+	return rr;
 }
 
 static JSValue
diff --git a/src/ecmascript/quickjs/nodelist2.c b/src/ecmascript/quickjs/nodelist2.c
index 5587dd45..acf423af 100644
--- a/src/ecmascript/quickjs/nodelist2.c
+++ b/src/ecmascript/quickjs/nodelist2.c
@@ -56,26 +56,6 @@ static JSClassID js_nodelist2_class_id;
 void *map_nodelist2;
 void *map_rev_nodelist2;
 
-static void *
-js_nodeList2_GetOpaque(JSValueConst this_val)
-{
-	REF_JS(this_val);
-
-	return attr_find_in_map_rev(map_rev_nodelist2, this_val);
-}
-
-static void
-js_nodeList2_SetOpaque(JSValueConst this_val, void *node)
-{
-	REF_JS(this_val);
-
-	if (!node) {
-		attr_erase_from_map_rev(map_rev_nodelist2, this_val);
-	} else {
-		attr_save_in_map_rev(map_rev_nodelist2, this_val, node);
-	}
-}
-
 #if 0
 static JSValue
 js_nodeList2_get_property_length(JSContext *ctx, JSValueConst this_val)
@@ -102,25 +82,10 @@ js_nodeList2_item(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst
 	if (argc != 1) {
 		return JS_UNDEFINED;
 	}
-	int index;
-	JS_ToInt32(ctx, &index, argv[0]);
-	LIST_OF(struct selector_node) *sni = (LIST_OF(struct selector_node) *)(js_nodeList2_GetOpaque(this_val));
-	int counter = 0;
-	struct selector_node *sn = NULL;
+	uint32_t index;
+	JS_ToUint32(ctx, &index, argv[0]);
 
-	foreach (sn, *sni) {
-		if (counter == index) {
-			break;
-		}
-		counter++;
-	}
-
-	if (!sn || !sn->node) {
-		return JS_NULL;
-	}
-	JSValue ret = getElement(ctx, sn->node);
-
-	return ret;
+	return JS_GetPropertyUint32(ctx, this_val, index);
 }
 
 static JSValue
@@ -161,9 +126,6 @@ getNodeList2(JSContext *ctx, void *nodes)
 	JS_SetPropertyFunctionList(ctx, proto, js_nodeList2_proto_funcs, countof(js_nodeList2_proto_funcs));
 	JS_SetClassProto(ctx, js_nodelist2_class_id, proto);
 
-	attr_save_in_map(map_nodelist2, nodes, proto);
-	js_nodeList2_SetOpaque(proto, nodes);
-
 	LIST_OF(struct selector_node) *sni = (LIST_OF(struct selector_node) *)nodes;
 
 	struct selector_node *sn = NULL;
diff --git a/test/ecmascript/assert/element.querySelectorAll.html b/test/ecmascript/assert/element.querySelectorAll.html
index acfdb59a..cd54823c 100644
--- a/test/ecmascript/assert/element.querySelectorAll.html
+++ b/test/ecmascript/assert/element.querySelectorAll.html
@@ -16,6 +16,9 @@ function myFunction() {
 
   var y = el.querySelectorAll('.b');
   console.assert(y.length === 1, 'b class b.');
+
+  console.assert(y.item(0).innerText === 'This b class.', 'b class');
+
 }
 
 console.error('element.querySelectorAll.html');