diff --git a/src/map.c b/src/map.c
index b8426a7..847346f 100644
--- a/src/map.c
+++ b/src/map.c
@@ -23,10 +23,10 @@ static void _destroy(skipstone_map *map, void (*destructor)(void *), int depth)
 
     for (i=0; i<SKIPSTONE_MAP_SLOTS; i++) {
         if (map[i].next) {
-            if (destructor && depth == SKIPSTONE_MAP_DEPTH) {
-                destructor(map[i].value);
-            } else {
+            if (depth < SKIPSTONE_MAP_DEPTH) {
                 _destroy(map[i].next, destructor, depth + 1);
+            } else if (destructor) {
+                destructor(map[i].value);
             }
         }
     }
diff --git a/src/map.c-e b/src/map.c-e
index b8426a7..847346f 100644
--- a/src/map.c-e
+++ b/src/map.c-e
@@ -23,10 +23,10 @@ static void _destroy(skipstone_map *map, void (*destructor)(void *), int depth)
 
     for (i=0; i<SKIPSTONE_MAP_SLOTS; i++) {
         if (map[i].next) {
-            if (destructor && depth == SKIPSTONE_MAP_DEPTH) {
-                destructor(map[i].value);
-            } else {
+            if (depth < SKIPSTONE_MAP_DEPTH) {
                 _destroy(map[i].next, destructor, depth + 1);
+            } else if (destructor) {
+                destructor(map[i].value);
             }
         }
     }