Fixed issue with hashmap