fixed data generation issue