Toy Data Crator bugfix