better handling of affiliation amounts