KRACOEUS-8270: fixing generators
Merge pull request #23 from leoherbie/KRACOEUS-8270

KRACOEUS-8270: fixing generators