fix a key not found error
Merge branch 'develop'