Merge pull request #1654 from BourgondAries/master

Ensure substring indexing never goes negative