fixed DataGenerator