lib DataGenerator is broken, try to fix it