diff --git a/java-strings/src/main/java/com/baeldung/string/searching/WordIndexer.java b/java-strings/src/main/java/com/baeldung/string/searching/WordIndexer.java
index 5314efb0b4..1bcad6dd32 100644
--- a/java-strings/src/main/java/com/baeldung/string/searching/WordIndexer.java
+++ b/java-strings/src/main/java/com/baeldung/string/searching/WordIndexer.java
@@ -11,11 +11,14 @@ public class WordIndexer {
         String lowerCaseTextString = textString.toLowerCase();
         String lowerCaseWord = word.toLowerCase();
 
-        while(index != -1){
-            index = lowerCaseTextString.indexOf(lowerCaseWord, index + 1);
-            if (index != -1) {
-                indexes.add(index);
+        while(index != -1) {
+            index = lowerCaseTextString.indexOf(lowerCaseWord, index);
+            if (index == -1) {
+                break;
             }
+
+            indexes.add(index);
+            index++;
         }
         return indexes;
     }