diff --git a/vpd-manager/manager.cpp b/vpd-manager/manager.cpp
index bab9f8a..c4d9838 100644
--- a/vpd-manager/manager.cpp
+++ b/vpd-manager/manager.cpp
@@ -580,7 +580,16 @@
     const std::vector<nlohmann::json>& groupEEPROM =
         jsonFile["frus"][vpdFilePath].get_ref<const nlohmann::json::array_t&>();
 
-    const nlohmann::json& singleFru = groupEEPROM[0];
+    nlohmann::json singleFru{};
+    for (const auto& item : groupEEPROM)
+    {
+        if (item["inventoryPath"] == objPath)
+        {
+            // this is the inventory we are looking for
+            singleFru = item;
+            break;
+        }
+    }
 
     // check if the device qualifies for CM.
     if (singleFru.value("concurrentlyMaintainable", false))