diff --git a/Arrangement_on_surface_2/include/CGAL/Arr_bounded_planar_topology_traits_2.h b/Arrangement_on_surface_2/include/CGAL/Arr_bounded_planar_topology_traits_2.h
index 21e8d2d23a7..d7816ee614d 100644
--- a/Arrangement_on_surface_2/include/CGAL/Arr_bounded_planar_topology_traits_2.h
+++ b/Arrangement_on_surface_2/include/CGAL/Arr_bounded_planar_topology_traits_2.h
@@ -351,8 +351,9 @@ public:
   typedef Arr_inc_insertion_zone_visitor<Arr>
                                               Zone_insertion_visitor;
   
-  typedef Arr_walk_along_line_point_location<Arr>
-                                              Default_point_location_strategy;
+  //typedef Arr_walk_along_line_point_location<Arr> Default_point_location_strategy;
+  typedef Arr_simple_point_location<Arr> Default_point_location_strategy;
+                                     
   //@}
 
   ///! \name Topology-traits methods.
diff --git a/Arrangement_on_surface_2/include/CGAL/Arr_topology_traits/Arr_planar_topology_traits_base_2.h b/Arrangement_on_surface_2/include/CGAL/Arr_topology_traits/Arr_planar_topology_traits_base_2.h
index 8f1f2d7e77b..18a43089b90 100644
--- a/Arrangement_on_surface_2/include/CGAL/Arr_topology_traits/Arr_planar_topology_traits_base_2.h
+++ b/Arrangement_on_surface_2/include/CGAL/Arr_topology_traits/Arr_planar_topology_traits_base_2.h
@@ -26,6 +26,7 @@
 
 #include <CGAL/Arr_enums.h>
 #include <CGAL/Arr_default_dcel.h>
+#include <CGAL/Arr_simple_point_location.h>
 #include <CGAL/Arr_walk_along_line_point_location.h>
 #include <CGAL/Arrangement_2/Arr_traits_adaptor_2.h>
 #include <CGAL/Sweep_line_2/Arr_construction_event.h>