diff --git a/src/tree_data.c b/src/tree_data.c
index fd14dc8..35d9347 100644
--- a/src/tree_data.c
+++ b/src/tree_data.c
@@ -2620,8 +2620,7 @@
     }
 
 cleanup:
-    //lyxp_set_free_content(&xp_set);
-    lyxp_set_cast(&xp_set, LYXP_SET_EMPTY);
+    lyxp_set_free_content(&xp_set);
     lyxp_expr_free((struct ly_ctx *)LYD_NODE_CTX(ctx_node), exp);
     return ret;
 }