diff --git a/lib/BleFingerprint/BleFingerprint.cpp b/lib/BleFingerprint/BleFingerprint.cpp
index 037e11c..6f14d28 100644
--- a/lib/BleFingerprint/BleFingerprint.cpp
+++ b/lib/BleFingerprint/BleFingerprint.cpp
@@ -650,7 +650,7 @@ bool BleFingerprint::shouldCount()
     bool prevCounting = counting;
     if (ignore || !countable || !hasValue)
         counting = false;
-    else if (getMsSinceFirstSeen() <= BleFingerprintCollection::countMs || getMsSinceLastSeen() > BleFingerprintCollection::countMs)
+    else if (getMsSinceLastSeen() > BleFingerprintCollection::countMs)
         counting = false;
     else if (counting && output.value.position > BleFingerprintCollection::countExit)
         counting = false;
diff --git a/lib/BleFingerprint/string_utils.cpp b/lib/BleFingerprint/string_utils.cpp
index 844b37f..9d141eb 100644
--- a/lib/BleFingerprint/string_utils.cpp
+++ b/lib/BleFingerprint/string_utils.cpp
@@ -125,12 +125,12 @@ bool prefixExists(const String &prefixes, const String &s)
         if (space > start)
         {
             auto sub = prefixes.substring(start, space);
-            if (s.indexOf(sub) != -1) return true;
+            if (s.indexOf(sub) == 0) return true;
         }
         start = space + 1;
     }
     auto sub = prefixes.substring(start);
-    return !sub.isEmpty() && s.indexOf(sub) != -1;
+    return !sub.isEmpty() && s.indexOf(sub) == 0;
 }
 
 bool spurt(const String &fn, const String &content)