be more flexible on matching