Fixed match hanging issue