Fixed issue with no key being found