manual selection bugfix