1 files changed, 1 insertions, 1 deletions

diff --git a/src/util/container_heap.c b/src/util/container_heap.c
index 96efe9d04..16918985d 100644
--- a/src/util/container_heap.c
+++ b/src/util/container_heap.c
@@ -158,7 +158,7 @@ find_element (struct GNUNET_CONTAINER_heap_node *node, void *element)
   if (node->left_child != NULL)
     ret = find_element (node->left_child, element);
 
-  if (node->right_child != NULL)
+  if ((ret == NULL) && (node->right_child != NULL))
     ret = find_element (node->right_child, element);
 
   return ret;