fixed attribute email issue, hopefully
merge
merged.