Fix data problem