diff --git a/py/guidance b/py/guidance
index 1ca0ff2b..4db20be1 160000
--- a/py/guidance
+++ b/py/guidance
@@ -1 +1 @@
-Subproject commit 1ca0ff2b876dfc86dadaa8b68ec55823089af0e8
+Subproject commit 4db20be1c2422be8c46cd499aff265907a2b58ca
diff --git a/py/llguidance/rust/py.rs b/py/llguidance/rust/py.rs
index 66d8742b..ae7af1f6 100644
--- a/py/llguidance/rust/py.rs
+++ b/py/llguidance/rust/py.rs
@@ -118,12 +118,15 @@ impl LLTokenizer {
             ));
         }
 
-        let tok_eos = tokenizer.getattr("eos_token_id")?.extract::<u32>()?;
+        let tokens = tokenizer.getattr("tokens")?.extract::<Vec<Vec<u8>>>()?;
+        let tok_eos = tokenizer
+            .getattr("eos_token_id")?
+            .extract::<Option<u32>>()?
+            .unwrap_or(tokens.len() as u32);
         let tok_bos = tokenizer
             .getattr("bos_token_id")?
             .extract::<u32>()
             .map_or(None, |v| Some(v));
-        let tokens = tokenizer.getattr("tokens")?.extract::<Vec<Vec<u8>>>()?;
         let info = TokRxInfo {
             vocab_size: tokens.len() as u32,
             tok_eos,