Remove unnecessary substringing
Merge pull request #23 from dlecocq/dan/spurious-substring

Remove unnecessary substringing