fixed attribute handling