Fixing generator shortcut