Fixed issue with data source not being used the new "proper" way.