Merge "fix wrong substring"