added fix for getting/creating an affinity group in the corrct location