Fix device selection