fixed bugs wrong selection