matching bug fixed