Less substrings, see #602