Fix Issue #15 - "String index out of range"