Fix data provider setting