fix
Merge branch 'fixselection' into dev