Devices support fix