fix hashmap usage