fixed
Merge branch 'hotfix/fix_count_key'