Fix data generator