fix selection bug
Merge branch 'master' into deploy