diff --git a/scripts/dbgbmap.py b/scripts/dbgbmap.py
index 1b5dd12c..57c8dc60 100755
--- a/scripts/dbgbmap.py
+++ b/scripts/dbgbmap.py
@@ -700,6 +700,9 @@ class Rbyd:
                         # keep track of eoff for best matching trunk
                         if trunk and j_ + size > trunk:
                             trunkeoff = j_ + size
+                            cksum = cksum_
+                            trunk_ = trunk__
+                            weight = weight_
 
             if not tag & TAG_ALT:
                 j_ += size
diff --git a/scripts/dbgbtree.py b/scripts/dbgbtree.py
index 366833c6..3af6a575 100755
--- a/scripts/dbgbtree.py
+++ b/scripts/dbgbtree.py
@@ -371,6 +371,9 @@ class Rbyd:
                         # keep track of eoff for best matching trunk
                         if trunk and j_ + size > trunk:
                             trunkeoff = j_ + size
+                            cksum = cksum_
+                            trunk_ = trunk__
+                            weight = weight_
 
             if not tag & TAG_ALT:
                 j_ += size
diff --git a/scripts/dbglfs.py b/scripts/dbglfs.py
index c33700e0..63bc77fa 100755
--- a/scripts/dbglfs.py
+++ b/scripts/dbglfs.py
@@ -400,6 +400,9 @@ class Rbyd:
                         # keep track of eoff for best matching trunk
                         if trunk and j_ + size > trunk:
                             trunkeoff = j_ + size
+                            cksum = cksum_
+                            trunk_ = trunk__
+                            weight = weight_
 
             if not tag & TAG_ALT:
                 j_ += size
diff --git a/scripts/dbgmtree.py b/scripts/dbgmtree.py
index 3166d87a..d2ba6cfe 100755
--- a/scripts/dbgmtree.py
+++ b/scripts/dbgmtree.py
@@ -386,6 +386,9 @@ class Rbyd:
                         # keep track of eoff for best matching trunk
                         if trunk and j_ + size > trunk:
                             trunkeoff = j_ + size
+                            cksum = cksum_
+                            trunk_ = trunk__
+                            weight = weight_
 
             if not tag & TAG_ALT:
                 j_ += size
diff --git a/scripts/dbgrbyd.py b/scripts/dbgrbyd.py
index 03e5bc8c..ab501619 100755
--- a/scripts/dbgrbyd.py
+++ b/scripts/dbgrbyd.py
@@ -981,6 +981,10 @@ def main(disk, blocks=None, *,
                         # keep track of eoff for best matching trunk
                         if trunk and j_ + size > trunk:
                             trunkeoff = j_ + size
+                            eoff = trunkeoff
+                            cksum = cksum_
+                            trunk_ = trunk__
+                            weight = weight_
 
             if not tag & TAG_ALT:
                 j_ += size