fix kk
Merge branch 'hotfix/bug1'