Fix matching boar with connection