Improve failed device