Fixed the affiliation data layout