bugfix wrong selection