diff --git a/src/lib/ebus/data.cpp b/src/lib/ebus/data.cpp
index 6ccbf871..ee44774f 100644
--- a/src/lib/ebus/data.cpp
+++ b/src/lib/ebus/data.cpp
@@ -1211,7 +1211,7 @@ result_t DataFieldTemplates::getFieldMap(const string& preferLanguage, vector<st
       }
     } else {
       map<string, size_t>::iterator previous = seen.find(lowerName);
-      if (seen.find(lowerName) != seen.end()) {
+      if (previous != seen.end()) {
         if (inDataFields) {
           *errorDescription = "duplicate field " + name;
         } else {
diff --git a/src/lib/ebus/message.cpp b/src/lib/ebus/message.cpp
index ad2c9af4..62d8c69f 100644
--- a/src/lib/ebus/message.cpp
+++ b/src/lib/ebus/message.cpp
@@ -1861,7 +1861,7 @@ result_t MessageMap::getFieldMap(const string& preferLanguage, vector<string>* r
       }
     } else {
       map<string, size_t>::iterator previous = seen.find(lowerName);
-      if (seen.find(lowerName) != seen.end()) {
+      if (previous != seen.end()) {
         if (inDataFields) {
           *errorDescription = "duplicate field " + name;
         } else {