Devices fix