diff --git a/src/common/kiwix/indexer.cpp b/src/common/kiwix/indexer.cpp
index 0092bc8d0..69e244643 100644
--- a/src/common/kiwix/indexer.cpp
+++ b/src/common/kiwix/indexer.cpp
@@ -24,13 +24,16 @@ namespace kiwix {
   /* Count word */
   unsigned int Indexer::countWords(const string &text) {
     unsigned int numWords = 1;
-    for(unsigned int i=0; i<text.size();) {
-      while(i<text.size() && text[i] != ' ') {
+    unsigned int length = text.size();
+
+    for(unsigned int i=0; i<length;) {
+      while(i<length && text[i] != ' ') {
 	i++;
       }
       numWords++;
       i++;
     }
+
     return numWords;
   }