Fixed choice bug
Merge branch 'hotfix-v4.9.10'