Fixing the data generator