Matching bug fix