Fix for existing datasource