Fix for resolving of the rest of the devices.