diff --git a/Arrangement_on_surface_2/include/CGAL/Arr_polyline_traits_2.h b/Arrangement_on_surface_2/include/CGAL/Arr_polyline_traits_2.h
index 021db2dbd3b..e41ebf3d484 100644
--- a/Arrangement_on_surface_2/include/CGAL/Arr_polyline_traits_2.h
+++ b/Arrangement_on_surface_2/include/CGAL/Arr_polyline_traits_2.h
@@ -445,17 +445,14 @@ public:
      */
     X_monotone_curve_2 operator()(const Point_2& p, const Point_2& q) const
     {
-      CGAL_precondition_code
-        (typename Segment_traits_2::Equal_2 equal =
-         this->m_poly_traits.segment_traits_2()->equal_2_object(););
       CGAL_precondition_msg
-        (!equal(p,q),
+        (!this->m_poly_traits.geometry_traits_2()->equal_2_object()(p,q),
          "Cannot construct a degenerated segment as a polyline");
-      X_monotone_segment_2 seg =  this->m_poly_traits.segment_traits_2()->
+      X_monotone_segment_2 seg =  this->m_poly_traits.geometry_traits_2()->
         construct_x_monotone_curve_2_object()(p, q);
 
 #ifdef CGAL_ALWAYS_LEFT_TO_RIGHT
-      if (this->m_poly_traits.segment_traits_2()->compare_xy_2_object()(p,q) ==
+      if (this->m_poly_traits.geometry_traits_2()->compare_xy_2_object()(p,q) ==
           LARGER)
         seg = m_poly_traits.geometry_traits_2()->
           construct_opposite_2_object()(seg);