Don't cut off the last char in substring