diff --git a/JsonParser/JsonObjectBase.cpp b/JsonParser/JsonObjectBase.cpp
index c86ff069..60d47ee8 100644
--- a/JsonParser/JsonObjectBase.cpp
+++ b/JsonParser/JsonObjectBase.cpp
@@ -10,15 +10,15 @@ using namespace ArduinoJson::Parser;
 
 int JsonObjectBase::getNestedTokenCount(jsmntok_t* token)
 {
-    int end = token->end;
-    int count = 0;	
+    int tokensToVisit = token->size;
+    int count = 0;
 
-    token++;
-
-    while (token->start < end)
+    while (tokensToVisit)
     {
-        token++;
         count++;
+        token++;
+        tokensToVisit--;
+        tokensToVisit += token->size;
     }
 
     return count;