Fix unselect index bug
Merge branch 'fixUnselectIndex'