Added a hashmap fix to shut the complainin online :/