diff --git a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/distance.h b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/distance.h
index 114db29d8b8..6810a5c7a3c 100644
--- a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/distance.h
+++ b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/distance.h
@@ -489,10 +489,12 @@ struct Triangle_structure_sampler_for_triangle_mesh
   void ms_edges_sample(std::size_t nb_points_per_edge,
                        double nb_pts_l_u)
   {
-    typename GeomTraits::Compute_squared_distance_3 squared_distance = this->geomtraits.compute_squared_distance_3_object();
-    if (nb_points_per_edge == 0 && nb_pts_l_u == 0)
-      nb_pts_l_u = 1. / min_edge_length_;
-    BOOST_FOREACH(edge_descriptor ed, edges(tm))
+    typename GeomTraits::Compute_squared_distance_3 squared_distance = this->gt.compute_squared_distance_3_object();
+
+    if(nb_points_per_edge == 0 && nb_pts_l_u == 0.)
+      nb_pts_l_u = 1. / min_edge_length;
+
+    for(edge_descriptor ed : edges(tm))
     {
       std::size_t nb_points = nb_points_per_edge;
       if(nb_points == 0)