Fix bug? On new generator