Fix bug introduced in last commit

Fixed introduced bugs in last commit doing unwise breaks of strings.