diff --git a/src/common/String.h b/src/common/String.h
index 663eb03aed..306bc93134 100644
--- a/src/common/String.h
+++ b/src/common/String.h
@@ -30,13 +30,13 @@ template<typename T> class SplitBase
 	{
 		if(posBefore == T::npos)
 			return reverse ? T() : parent.Substr(posFrom);
-		return parent.Substr(reverse ? 0 : posFrom, includeSeparator ? posAfter : posBefore);
+		return parent.Between(reverse ? 0 : posFrom, includeSeparator ? posAfter : posBefore);
 	}
 	inline T After(bool includeSeparator = false) const
 	{
 		if(posBefore == T::npos)
 			return reverse ? parent.Substr(0, posFrom) : T();
-		return parent.Substr(includeSeparator ? posBefore : posAfter, reverse ? posFrom : T::npos);
+		return parent.Between(includeSeparator ? posBefore : posAfter, reverse ? posFrom : T::npos);
 	}
 
 	inline size_t PositionFrom() const { return posFrom; }