Index: uspace/lib/cpp/include/internal/rbtree.hpp
===================================================================
--- uspace/lib/cpp/include/internal/rbtree.hpp	(revision ffd94b93c0295dab2b2d0b24fabc30de421ba450)
+++ uspace/lib/cpp/include/internal/rbtree.hpp	(revision 71cde76cc1cd50865b5fcf1bbef15e0747c0d0d4)
@@ -323,6 +323,8 @@
                     if (key_compare_(key, key_extractor_(current->value)))
                         current = current->left;
+                    else if (key_compare_(key_extractor_(current->value), key))
+                        current = current->right;
                     else
-                        current = current->right;
+                        return current;
                 }