Bug fix for hashmap.