- correct attribute handling