Minor fix to Generator