improve adapter matching