update fix the matcher bugs