Added fix in AddAttributeSet()