Fix the issue for the device