fix device selection