Fixed connect, avoids agent duplicates