diff --git a/Surface_mesh_parameterization/include/CGAL/Surface_mesh_parameterization/Two_vertices_parameterizer_3.h b/Surface_mesh_parameterization/include/CGAL/Surface_mesh_parameterization/Two_vertices_parameterizer_3.h
index c581cf66be5..48f0797c17b 100644
--- a/Surface_mesh_parameterization/include/CGAL/Surface_mesh_parameterization/Two_vertices_parameterizer_3.h
+++ b/Surface_mesh_parameterization/include/CGAL/Surface_mesh_parameterization/Two_vertices_parameterizer_3.h
@@ -129,12 +129,12 @@ public:
     const PPM ppmap = get(vertex_point, mesh);
 
     // Get mesh's bounding box
-    double xmin = (std::numeric_limits<double>::max)();
-    double ymin = (std::numeric_limits<double>::max)();
-    double zmin = (std::numeric_limits<double>::max)();
-    double xmax = (std::numeric_limits<double>::min)();
-    double ymax = (std::numeric_limits<double>::min)();
-    double zmax = (std::numeric_limits<double>::min)();
+    double xmin = std::numeric_limits<double>::infinity();
+    double ymin = std::numeric_limits<double>::infinity();
+    double zmin = std::numeric_limits<double>::infinity();
+    double xmax = -std::numeric_limits<double>::infinity();
+    double ymax = -std::numeric_limits<double>::infinity();
+    double zmax = -std::numeric_limits<double>::infinity();
 
     BOOST_FOREACH(vertex_descriptor vd, vertices) {
       const Point_3& position = get(ppmap,vd);
@@ -226,10 +226,10 @@ public:
 
     // Project onto longest bounding box axes,
     // Set extrema vertices' (u,v) in unit square and mark them as "parameterized"
-    double umin = (std::numeric_limits<double>::max)();
-    double umax = (std::numeric_limits<double>::min)();
-    double vmin = (std::numeric_limits<double>::max)();
-    double vmax = (std::numeric_limits<double>::min)();
+    double umin = std::numeric_limits<double>::infinity();
+    double umax = -std::numeric_limits<double>::infinity();
+    double vmin = std::numeric_limits<double>::infinity();
+    double vmax = -std::numeric_limits<double>::infinity();
 
     BOOST_FOREACH(vertex_descriptor vd, vertices) {
       const Point_3& position = get(ppmap, vd);