diff --git a/include/openbmc_dbus_rest.hpp b/include/openbmc_dbus_rest.hpp
index e0c16d9..6bd3920 100644
--- a/include/openbmc_dbus_rest.hpp
+++ b/include/openbmc_dbus_rest.hpp
@@ -863,7 +863,7 @@
         }
         else if (argCode.starts_with("(") && argCode.ends_with(")"))
         {
-            std::string containedType = argCode.substr(1, argCode.size() - 1);
+            std::string containedType = argCode.substr(1, argCode.size() - 2);
             r = sd_bus_message_open_container(m, SD_BUS_TYPE_STRUCT,
                                               containedType.c_str());
             if (r < 0)
@@ -872,7 +872,7 @@
             }
 
             nlohmann::json::const_iterator it = j->begin();
-            for (const std::string& argCode2 : dbusArgSplit(argType))
+            for (const std::string& argCode2 : dbusArgSplit(containedType))
             {
                 if (it == j->end())
                 {
@@ -889,7 +889,7 @@
         }
         else if (argCode.starts_with("{") && argCode.ends_with("}"))
         {
-            std::string containedType = argCode.substr(1, argCode.size() - 1);
+            std::string containedType = argCode.substr(1, argCode.size() - 2);
             r = sd_bus_message_open_container(m, SD_BUS_TYPE_DICT_ENTRY,
                                               containedType.c_str());
             if (r < 0)