fixed issue of match