Data only provider fix.