Fix device problem