bugfix, extra data source creation