Generator Attributes fix