Fix for cases with several data access providers.