Fixed further problems with attributes