Fix data-provider-master