Attribute fix for attributes with spaces