Fixed the key fetching