Have a substring check, close #2352