bug with hashmap fixed