Merge pull request #2436 from dalance/fix_generate