Hash map quirks fix