Fix Order of Devices