Bug fix for "all" private datasources