Attributes fix