diff --git a/projects/hip/include/hip/hcc_detail/code_object_bundle.hpp b/projects/hip/include/hip/hcc_detail/code_object_bundle.hpp
index c36dd91813..7b97503c16 100644
--- a/projects/hip/include/hip/hcc_detail/code_object_bundle.hpp
+++ b/projects/hip/include/hip/hcc_detail/code_object_bundle.hpp
@@ -84,6 +84,9 @@ class Bundled_code_header {
                 std::copy_n(f + y.header.offset, y.header.bundle_sz, std::back_inserter(y.blob));
 
                 it += y.header.triple_sz;
+
+                x.bundled_code_size = std::max(x.bundled_code_size, 
+                                               y.header.offset + y.header.bundle_sz);
             }
 
             return true;
@@ -123,6 +126,8 @@ class Bundled_code_header {
     // MANIPULATORS
     Bundled_code_header& operator=(const Bundled_code_header&) = default;
     Bundled_code_header& operator=(Bundled_code_header&&) = default;
+
+    size_t bundled_code_size = 0;
 };
 
 // CREATORS
diff --git a/projects/hip/src/program_state.cpp b/projects/hip/src/program_state.cpp
index 8766134582..88cdeeb404 100644
--- a/projects/hip/src/program_state.cpp
+++ b/projects/hip/src/program_state.cpp
@@ -209,10 +209,16 @@ const unordered_map<hsa_isa_t, vector<vector<char>>>& code_object_blobs(bool reb
             nullptr);
 
         for (auto&& blob : blobs) {
-            Bundled_code_header tmp{blob};
-            if (valid(tmp)) {
-                for (auto&& bundle : bundles(tmp)) {
-                    r[triple_to_hsa_isa(bundle.triple)].push_back(bundle.blob);
+            for (auto sub_blob = blob.begin(); sub_blob != blob.end(); ) {
+                Bundled_code_header tmp(sub_blob, blob.end());
+                if (valid(tmp)) {
+                    for (auto&& bundle : bundles(tmp)) {
+                        r[triple_to_hsa_isa(bundle.triple)].push_back(bundle.blob);
+                    }
+                    sub_blob+=tmp.bundled_code_size;
+                }
+                else {
+                    break;
                 }
             }
         }