Fix to display proper Device