fix auto pair