fixed
Merge branch 'hotfix/key-error'