Correctly compute connector selection