Fixed bug with values hashmap not being initialized