Fix Device Class