Fixed issues with double quotes in generators.