Fixed match bug