Fix for last patch, actually add the attributes.