1 files changed, 7 insertions, 6 deletions
diff --git a/src/main/java/org/traccar/helper/Parser.java b/src/main/java/org/traccar/helper/Parser.java
index 22e98ded1..aa39e1ad7 100644
--- a/src/main/java/org/traccar/helper/Parser.java
+++ b/src/main/java/org/traccar/helper/Parser.java
@@ -48,13 +48,14 @@ public class Parser {
     }
 
     public boolean hasNext(int number) {
-        String value = matcher.group(position);
-        if (value != null && !value.isEmpty()) {
-            return true;
-        } else {
-            position += number;
-            return false;
+        for (int i = position; i < position + number; i++) {
+            String value = matcher.group(i);
+            if (value != null && !value.isEmpty()) {
+                return true;
+            }
         }
+        position += number;
+        return false;
     }
 
     public String next() {