Fei add auto match checking