Fixed the HashMapKeyStores