diff --git a/configuration/ibm/vpd_inventory.json b/configuration/ibm/vpd_inventory.json
index a949d90..b9deeab 100644
--- a/configuration/ibm/vpd_inventory.json
+++ b/configuration/ibm/vpd_inventory.json
@@ -34,7 +34,7 @@
     "frus": {
         "/sys/bus/i2c/drivers/at24/8-0050/eeprom": [
             {
-                "inventoryPath": "/system/chassis/motherboard",
+                "inventoryPath": "/xyz/openbmc_project/inventory/system/chassis/motherboard",
                 "isSystemVpd": true,
                 "extraInterfaces": {
                     "xyz.openbmc_project.Inventory.Item.Board.Motherboard": null,
@@ -44,7 +44,7 @@
                 }
             },
             {
-                "inventoryPath": "/system",
+                "inventoryPath": "/xyz/openbmc_project/inventory/system",
                 "inherit": false,
                 "isSystemVpd": true,
                 "copyRecords": ["VSYS"],
@@ -70,7 +70,7 @@
                 }
             },
             {
-                "inventoryPath": "/system/chassis",
+                "inventoryPath": "/xyz/openbmc_project/inventory/system/chassis",
                 "inherit": false,
                 "isSystemVpd": true,
                 "extraInterfaces": {
diff --git a/vpd-manager/include/utility/dbus_utility.hpp b/vpd-manager/include/utility/dbus_utility.hpp
index df57cd1..c155d0c 100644
--- a/vpd-manager/include/utility/dbus_utility.hpp
+++ b/vpd-manager/include/utility/dbus_utility.hpp
@@ -267,11 +267,10 @@
     {
         for (const auto& l_objectKeyValue : objectMap)
         {
-            auto l_nodeHandle = objectMap.extract(l_objectKeyValue.first);
-
-            if (l_nodeHandle.key().str.find(constants::pimPath, 0) !=
+            if (l_objectKeyValue.first.str.find(constants::pimPath, 0) !=
                 std::string::npos)
             {
+                auto l_nodeHandle = objectMap.extract(l_objectKeyValue.first);
                 l_nodeHandle.key() = l_nodeHandle.key().str.replace(
                     0, std::strlen(constants::pimPath), "");
                 objectMap.insert(std::move(l_nodeHandle));