fix select bug
Merge branch 'fixbug' into dev