fixed
Merge branch 'hotfix/nodata4key_problem'