weak hash map fix 2