diff --git a/core/account/src/directory.rs b/core/account/src/directory.rs
index 0814889..0971616 100644
--- a/core/account/src/directory.rs
+++ b/core/account/src/directory.rs
@@ -156,12 +156,12 @@ pub fn decode_bundle_payload(payload: &[u8]) -> Result<DecodedBundle, BundleErro
     if body.len() != count * 32 {
         return Err(BundleError::Short);
     }
-    let devices = body
-        .chunks_exact(32)
-        .map(|c| c.try_into().expect("chunks_exact(32) yields 32 bytes"))
-        .collect();
+    let (devices, _) = body.as_chunks::<32>();
 
-    Ok(DecodedBundle { lamport, devices })
+    Ok(DecodedBundle {
+        lamport,
+        devices: devices.to_vec(),
+    })
 }
 
 /// Decode `bundle`, confirm it belongs to `expected_account`, and verify the