DeviceConfig => OnChange fix