#96 changed generators order