diff --git a/plugins/snmp/snmp__juniper b/plugins/snmp/snmp__juniper
index 44ee5ae3..e2873511 100755
--- a/plugins/snmp/snmp__juniper
+++ b/plugins/snmp/snmp__juniper
@@ -109,8 +109,7 @@ class JunOSSnmpClient(object):
 				if not str(name).startswith(jnxOperatingTable):
 					continue
 
-				# TODO: Find a better way to get the routing engines in a cluster
-				if str(value).endswith(' Routing Engine'):
+				if 'Routing Engine' in str(value):
 					devices[str(name)[len(jnxOperatingTable):]] = re.sub("[^\w]", '_', str(value).replace(' Routing Engine', ''))
 		return devices