diff --git a/src/RizinUtils.h b/src/RizinUtils.h
index 75d1ef65..cd4e48ee 100644
--- a/src/RizinUtils.h
+++ b/src/RizinUtils.h
@@ -11,9 +11,9 @@ typedef struct rz_list_iter_t RzListIter;
 
 template<typename T, typename F> void rz_list_foreach_cpp(RzList *list, const F &func)
 {
-	for(RzListIter *it = list->head; it; it = it->n)
+	for(RzListIter *it = list->head; it; it = rz_list_iter_get_next(it))
 	{
-		func(reinterpret_cast<T *>(it->data));
+		func(reinterpret_cast<T *>(rz_list_iter_get_data(it)));
 	}
 }
 
diff --git a/test/db/extras/ghidra b/test/db/extras/ghidra
index bb3c1877..50891677 100644
--- a/test/db/extras/ghidra
+++ b/test/db/extras/ghidra
@@ -3138,13 +3138,10 @@ pdg
 EOF
 EXPECT=<<EOF
 
-// WARNING: Variable defined which should be unmapped: var_30h
-
 jstring sym.Java_JNIFoo_nativeFoo(JNIEnv *env, jobject obj)
 {
     int64_t iVar1;
     jstring pvVar2;
-    int64_t var_30h;
     
     iVar1 = sym.imp.malloc(0x1e);
     if (iVar1 == 0) {