diff --git a/src/lib/ebus/data.h b/src/lib/ebus/data.h
index fe2f71bc..41989bb4 100755
--- a/src/lib/ebus/data.h
+++ b/src/lib/ebus/data.h
@@ -647,8 +647,8 @@ class DataFieldSet : public DataField {
    * @param name the field name.
    * @param fields the @a vector of @a SingleDataField instances part of this set.
    */
-  DataFieldSet(const string& name, const vector<const SingleDataField*> fields)
-    : DataField(name), m_fields(fields) {
+  DataFieldSet(const string& fieldName, const vector<const SingleDataField*> fields)
+    : DataField(fieldName), m_fields(fields) {
     bool uniqueNames = true;
     size_t ignoredCount = 0;
     map<string, string> names;
@@ -657,6 +657,9 @@ class DataFieldSet : public DataField {
         ignoredCount++;
         continue;
       }
+      if (!uniqueNames) {
+        continue;
+      }
       string name = field->getName(-1);
       if (name.empty() || names.find(name) != names.end()) {
         uniqueNames = false;