diff --git a/crates/fj-kernel/src/algorithms/sweep/face.rs b/crates/fj-kernel/src/algorithms/sweep/face.rs
index 1b03318a7..6eb0dda39 100644
--- a/crates/fj-kernel/src/algorithms/sweep/face.rs
+++ b/crates/fj-kernel/src/algorithms/sweep/face.rs
@@ -104,8 +104,11 @@ mod tests {
 
         let surface = services.objects.surfaces.xy_plane();
         let solid = Sketch::builder()
-            .with_surface(surface.clone())
-            .with_polygon_from_points(TRIANGLE, &mut services.objects)
+            .with_polygon_from_points(
+                surface.clone(),
+                TRIANGLE,
+                &mut services.objects,
+            )
             .build(&mut services.objects)
             .sweep(UP, &mut services.objects);
 
@@ -148,8 +151,11 @@ mod tests {
 
         let surface = services.objects.surfaces.xy_plane();
         let solid = Sketch::builder()
-            .with_surface(surface.clone())
-            .with_polygon_from_points(TRIANGLE, &mut services.objects)
+            .with_polygon_from_points(
+                surface.clone(),
+                TRIANGLE,
+                &mut services.objects,
+            )
             .build(&mut services.objects)
             .sweep(DOWN, &mut services.objects);
 
diff --git a/crates/fj-kernel/src/builder/sketch.rs b/crates/fj-kernel/src/builder/sketch.rs
index afb649241..38aecce95 100644
--- a/crates/fj-kernel/src/builder/sketch.rs
+++ b/crates/fj-kernel/src/builder/sketch.rs
@@ -40,15 +40,12 @@ impl SketchBuilder {
     /// Construct a polygon from a list of points
     pub fn with_polygon_from_points(
         mut self,
+        surface: Handle<Surface>,
         points: impl IntoIterator<Item = impl Into<Point<2>>>,
         objects: &mut Service<Objects>,
     ) -> Self {
-        let surface = self
-            .surface
-            .as_ref()
-            .expect("Can't build `Sketch` without `Surface`");
         self.faces.extend([Face::partial()
-            .with_exterior_polygon_from_points(surface.clone(), points)
+            .with_exterior_polygon_from_points(surface, points)
             .build(objects)
             .insert(objects)]);
         self