Fix attributes issue