matchfinder bug fix