KRACOEUS-8270: fixing generators