detect force select before setting final select
Merge branch 'hotfix-kevin-bugs' of github.com:ShifuML/shifu into hotfix-kevin-bugs