Fixed sample_data generation