Fix dataSetChange problem