Fixing issue with Devices