Fixed minor bug in matcher