fix issue #28 fix generator