fix skipping of data sources