Outputting email address from Affiliated record

We just upgraded to v15 and I'm trying to run an Output Set against a List where I've included Affiliated Individuals. The Affiliated Individuals are returned on the List, but the emails listed when I run the Execute an Output Set report  are the Affiliated Individuals' primary email addresses and not the addresses tied to the Affiliation. I want the email addresses that are listed on the Affiliated records since they're usually work emails whereas the primary email tends to be a personal email address.

What am I doing wrong? Thanks!