#19 changed some Attribute-type