fixed the affiiation issue