Fixed issue with new devices