fix partner selection