Fix "no key found" issue