Fixed nasty bug introduced by previous commit (attribute sets not