diff --git a/crates/kernel/src/body.rs b/crates/kernel/src/body.rs
index 4d3803cdaf..5b2b5e6af2 100644
--- a/crates/kernel/src/body.rs
+++ b/crates/kernel/src/body.rs
@@ -940,7 +940,10 @@ impl Body {
             }
         }
         match self.meshes.as_ref().filter(|m| std::sync::Arc::ptr_eq(&m.record, &self.record)) {
-            Some(memo) => Ok(Mesh::clone(&remembered(&memo.made, t, || self.mesh_of(&self.mesh_plan_untimed(t)?))?)),
+            Some(memo) => {
+                let kept: std::sync::Arc<Mesh> = remembered(&memo.made, t, || self.mesh_of(&self.mesh_plan_untimed(t)?))?;
+                Ok(Mesh::clone(&kept))
+            }
             None => self.mesh_of(&self.mesh_plan_untimed(t)?),
         }
     }
diff --git a/crates/kernel/src/surface_trim.rs b/crates/kernel/src/surface_trim.rs
index c63423d68e..ca945ee0d6 100644
--- a/crates/kernel/src/surface_trim.rs
+++ b/crates/kernel/src/surface_trim.rs
@@ -67,7 +67,7 @@ pub fn trim_keep(body: &Body, tool: &SplitTool, keep: TrimKeep) -> Result<Body>
     let (split, _) = crate::splitface::split_any(body, &all, tool)?;
     let kept: Vec<bool> = match keep {
         TrimKeep::Side(p) if crate::splitface::field_count(tool)? == 1 => {
-            let side = ToolSide::of(tool)?;
+            let side = ToolSide::of(tool, body)?;
             let want = side.at(p);
             if !want.is_finite() {
                 return Err(KernelError::Invalid("the side of the tool the point is on can't be told".into()));
@@ -162,7 +162,7 @@ pub fn mutual_trim(a: &Body, b: &Body, keep_a: TrimKeep, keep_b: TrimKeep, exten
 /// `x` trimmed by `tool` where the tool crosses it; whole where it ends on the tool; extended to
 /// the tool first (when `extend`) where it stops short of it.
 fn cut_by(x: &Body, tool: &SplitTool, keep: TrimKeep, extend: bool, name: &str) -> Result<Body> {
-    let side = ToolSide::of(tool)?;
+    let side = ToolSide::of(tool, x)?;
     let size = x.size();
     let touch = size * 1e-6 + 1e-9;
     let m = x.mesh(&crate::MeshTolerance::chord(size * 2e-3))?;