diff --git a/src/tiffimage_int.cpp b/src/tiffimage_int.cpp
index a3917aff..ee8e0168 100644
--- a/src/tiffimage_int.cpp
+++ b/src/tiffimage_int.cpp
@@ -1968,8 +1968,8 @@ void TiffCreator::getPath(TiffPath& tiffPath, uint32_t extendedTag, IfdId group,
     tiffPath.push(TiffPathItem(extendedTag, group));
     const auto ts = tiffTreeTable_.find(TiffGroupKey(root, group));
     assert(ts != tiffTreeTable_.end());
-    extendedTag = ts->second.parentExtTag_;
-    group = ts->second.parentGroup_;
+    extendedTag = ts->second.second;
+    group = ts->second.first;
     if (ts->first == TiffGroupKey(root, IfdId::ifdIdNotSet)) {
       break;
     }
diff --git a/src/tiffimage_int.hpp b/src/tiffimage_int.hpp
index abc5879a..7fc55da4 100644
--- a/src/tiffimage_int.hpp
+++ b/src/tiffimage_int.hpp
@@ -152,12 +152,8 @@ using TiffGroupTable = std::unordered_map<TiffGroupKey, NewTiffCompFct, TiffGrou
          Multiple trees are needed as TIFF-based RAW image formats do not always
          use standard TIFF layout.
 */
-struct TiffTreeStruct {
-  IfdId parentGroup_;      //!< Parent group
-  uint32_t parentExtTag_;  //!< Parent tag (32 bit so that it can contain special tags)
-};
-
-using TiffTreeTable = std::unordered_map<TiffGroupKey, TiffTreeStruct, TiffGroupKey_hash>;
+using TiffTreeParent = std::pair<IfdId, uint32_t>;  // Parent group, parent tag
+using TiffTreeTable = std::unordered_map<TiffGroupKey, TiffTreeParent, TiffGroupKey_hash>;
 
 /*!
   @brief TIFF component factory.