diff --git a/Common/TreeUtils.cpp b/Common/TreeUtils.cpp
index 1521270dcd864b518b66e7172aef8d99e4d3b0e8..f59fe4eeebe54b767fce7b77aff9b06e6461297d 100644
--- a/Common/TreeUtils.cpp
+++ b/Common/TreeUtils.cpp
@@ -27,6 +27,13 @@ void Tree_Delete(Tree_T * tree)
   Free(tree);
 }
 
+void Tree_Delete(Tree_T * tree, void (*freefn) (void * ))
+{
+  if(!tree) return;
+  avl_free_table(tree->root, freefn, 0);
+  Free(tree);
+}
+
 void *Tree_Add(Tree_T * tree, void *data)
 {
   if(!tree) return 0;
diff --git a/Common/TreeUtils.h b/Common/TreeUtils.h
index 7dd9526b6070c42c68886ea44abebc5f50753aa9..e76b57a39588d0ac0cb51a3bdf9fa8e03cd39ad2 100644
--- a/Common/TreeUtils.h
+++ b/Common/TreeUtils.h
@@ -16,6 +16,7 @@ typedef struct {
 
 Tree_T *Tree_Create(int size, int (*fcmp)(const void *a, const void *b));
 void    Tree_Delete(Tree_T *Tree);
+void    Tree_Delete(Tree_T *Tree, void (*freefn)(void * ) );
 void   *Tree_Add(Tree_T *tree, void *data);
 int     Tree_Nbr(Tree_T *Tree);
 int     Tree_Insert(Tree_T *Tree, void *data);
diff --git a/Geo/findLinks.cpp b/Geo/findLinks.cpp
index 9b4213e23b1b669f859e3b02d240dfb8a4cdacf0..8f1973f8d7a95c32c588934f3d83dd5eab0af4de 100644
--- a/Geo/findLinks.cpp
+++ b/Geo/findLinks.cpp
@@ -5,6 +5,7 @@
 
 #include <stdlib.h>
 #include "GmshMessage.h"
+#include "MallocUtils.h"
 #include "GModel.h"
 #include "TreeUtils.h"
 #include "ListUtils.h"
@@ -18,6 +19,13 @@ typedef struct{
   List_T *l;
 }lnk;
 
+
+static void freeLink(void * link)
+{
+  List_Delete(((lnk*) link)->l); 
+  Free(link); 
+}
+
 static int complink(const void *a, const void *b)
 {
   lnk *q = (lnk*)a;
@@ -193,7 +201,7 @@ int allEdgesLinked(int ed, List_T *edges)
     orientAndSortEdges(edges, links);
   }
 
-  Tree_Delete(links);
+  Tree_Delete(links, freeLink);
   Tree_Delete(points);
 
   return found;
@@ -305,7 +313,7 @@ int allFacesLinked(int fac, List_T *faces)
     // necessary...
   }
 
-  Tree_Delete(links);
+  Tree_Delete(links,freeLink);
   Tree_Delete(edges);
 
   return found;