Changed order in which auto selection happens