diff --git a/mr/src/main/java/org/elasticsearch/hadoop/serialization/dto/NodeInfo.java b/mr/src/main/java/org/elasticsearch/hadoop/serialization/dto/NodeInfo.java
index a7d9c54b1..aad07c729 100644
--- a/mr/src/main/java/org/elasticsearch/hadoop/serialization/dto/NodeInfo.java
+++ b/mr/src/main/java/org/elasticsearch/hadoop/serialization/dto/NodeInfo.java
@@ -58,8 +58,8 @@ public NodeInfo(String id, Map<String, Object> map) {
             this.isIngest = false;
         } else {
             List<String> roles = (List<String>) map.get("roles");
-            this.isClient = roles.contains("data") == false;
-            this.isData = roles.contains("data");
+            this.isData = roles.stream().anyMatch(role -> role.contains("data"));
+            this.isClient = !this.isData;
             this.isIngest = roles.contains("ingest");
         }
         Map<String, Object> httpMap = (Map<String, Object>) map.get("http");
@@ -152,4 +152,4 @@ public String toString() {
                 ", isData=" + isData +
                 '}';
     }
-}
\ No newline at end of file
+}