Fix data generation