fix passing wrong data to hashmap