Resolved matching bug