diff --git a/src/eventsplainreader.rs b/src/eventsplainreader.rs
index 82bf7ab..8ac5736 100644
--- a/src/eventsplainreader.rs
+++ b/src/eventsplainreader.rs
@@ -143,7 +143,7 @@ pub fn test_bins_gen_dim0_f32_v00(
         if off >= offs.end {
             break;
         }
-        let ts1 = TsNano::from_ns(partt.msp_div().ns() * msp + partt.bin_len().ns() * off as u64);
+        let ts1 = TsNano::from_ns(partt.patch_dt().ns() * msp + partt.bin_len().ns() * off as u64);
         let ts2 = ts1.add_dt_nano(partt.bin_len().dt_ns());
         off += 1;
         if (ts1.ns() / 1000000000) % 5 < 2 {
diff --git a/src/timebin/cached/reader.rs b/src/timebin/cached/reader.rs
index e646d15..e0e3f82 100644
--- a/src/timebin/cached/reader.rs
+++ b/src/timebin/cached/reader.rs
@@ -178,11 +178,11 @@ impl Stream for CachedReader {
                     match PrebinnedPartitioning::try_from(self.range.bin_len_dt_ms()) {
                         Ok(partt) => {
                             let binlen = self.bin_len.ns();
-                            let div = partt.msp_div().ns();
+                            let div = partt.patch_dt().ns();
                             let msp = self.ts1next.ns() / div;
                             let off1 = (self.ts1next.ns() - div * msp) / binlen;
                             let off2 = (self.range.nano_end().ns() - div * msp) / binlen;
-                            let off2 = partt.clamp_off(off2 as u32);
+                            let off2 = partt.patch_len().min(off2 as u32);
                             self.ts1next = TsNano::from_ns(binlen * off2 as u64 + div * msp);
                             let offs = off1 as u32..off2 as u32;
                             let fut =