fix the data generation problem
...