diff --git a/m-rbtree.h b/m-rbtree.h
index f29b9eff..22cdde4c 100644
--- a/m-rbtree.h
+++ b/m-rbtree.h
@@ -414,7 +414,7 @@ typedef enum {
   {                                                                     \
     assert (it != NULL);                                                \
     assert (child == 0 || child == 1);                                  \
-    /* FIXME: If end_p, do nothing ? */                                 \
+    if (it->cpt == 0) return;                                           \
     unsigned int cpt = it->cpt - 1;                                     \
     node_t *n = it->stack[cpt];                                         \
     const int right = 1 ^ child;                                        \