bug fix hashmap