Fix dataset generator