Fixed generator
Merge branch 'hotfix/0.6.2'

* hotfix/0.6.2:
  Fixed generator