Fix du script de generation
Fixing generation bug
More fixes