diff --git a/src/chip_data/hei_chip_data.cpp b/src/chip_data/hei_chip_data.cpp
index 3224f3f..847c0a5 100644
--- a/src/chip_data/hei_chip_data.cpp
+++ b/src/chip_data/hei_chip_data.cpp
@@ -400,7 +400,7 @@
     HEI_ASSERT(VERSION_1 <= version && version <= VERSION_2);
 
     // Allocate memory for the new isolation chip.
-    auto isoChip = std::make_unique<IsolationChip>(chipType);
+    auto isoChip = std::make_shared<IsolationChip>(chipType);
 
     // Read the register list metadata.
     SectionKeyword_t regsKeyword;
@@ -458,7 +458,7 @@
     HEI_ASSERT(stream.eof());
 
     // Add this isolation chip to the collective list of isolation chips.
-    auto ret = io_isoChips.emplace(chipType, std::move(isoChip));
+    auto ret = io_isoChips.emplace(chipType, isoChip);
     HEI_ASSERT(ret.second); // Just in case.
 }