Index: uspace/lib/cpp/include/__bits/adt/hash_table_policies.hpp
===================================================================
--- uspace/lib/cpp/include/__bits/adt/hash_table_policies.hpp	(revision 3ae7827d5e3c038ca1bd1cbd4fb4ea1e13d539a6)
+++ uspace/lib/cpp/include/__bits/adt/hash_table_policies.hpp	(revision 9ba040a78117125d1d44fb23cefc1bd1c88ff152)
@@ -342,7 +342,7 @@
                 auto tmp = current;
                 current = current->next;
-                tmp->unlink();
-
-                --table.size_;
+                tmp->next = tmp;
+                tmp->prev = tmp;
+
                 if (!table.keys_equal(key, tmp->value))
                 {
@@ -355,4 +355,5 @@
                 else
                 {
+                    --table.size_;
                     ++res;
 
