bugfix
Merge branch 'hotfix/keys-not-found'