Fix wrong selection