diff --git a/src/renderer.typ b/src/renderer.typ
index 5afda4f..6f0e793 100644
--- a/src/renderer.typ
+++ b/src/renderer.typ
@@ -407,6 +407,11 @@
       indices.push(r.start)
       indices.push(r.end)
     }
+    // ensure first and last bits are included
+    if not indices.contains(0) { indices.insert(0, struct.start) }
+    if not indices.contains(struct.bits + struct.start - 1) {
+      indices.push(struct.bits + struct.start - 1)
+    }
   }
 
   for i in range(struct.bits) {