Fix Device select problem