fixed getmatch