Issue #1 : replace startsWith with indexOf