Hash map fix