fix auto matching