diff --git a/include/boost/geometry/extensions/algorithms/connect.hpp b/include/boost/geometry/extensions/algorithms/connect.hpp
index 292a503e5..f4cc12b29 100644
--- a/include/boost/geometry/extensions/algorithms/connect.hpp
+++ b/include/boost/geometry/extensions/algorithms/connect.hpp
@@ -60,7 +60,7 @@ struct map_policy
 {
     typedef typename strategy::distance::services::default_strategy
         <
-            point_tag, Point
+            point_tag, point_tag, Point
         >::type strategy_type;
 
     // Have a map<point, <index,start/end> > such that we can find
@@ -181,7 +181,7 @@ struct fuzzy_policy
 {
     typedef typename strategy::distance::services::default_strategy
         <
-            point_tag, Point
+            point_tag, point_tag, Point
         >::type strategy_type;
 
     // Have a map<point, <index,start/end> > such that we can find
diff --git a/include/boost/geometry/extensions/algorithms/selected.hpp b/include/boost/geometry/extensions/algorithms/selected.hpp
index 805f8d7fb..8890d6ab0 100644
--- a/include/boost/geometry/extensions/algorithms/selected.hpp
+++ b/include/boost/geometry/extensions/algorithms/selected.hpp
@@ -145,7 +145,7 @@ struct close_to_segment
             // Call corresponding strategy
             typedef typename strategy::distance::services::default_strategy
                 <
-                    segment_tag, P, PS
+                    point_tag, segment_tag, P, PS
                 >::type strategy_type;
             typedef typename strategy::distance::services::return_type<strategy_type, P, PS>::type return_type;
 
diff --git a/include/boost/geometry/extensions/gis/geographic/strategies/andoyer.hpp b/include/boost/geometry/extensions/gis/geographic/strategies/andoyer.hpp
index b4c016c90..d3a9aff71 100644
--- a/include/boost/geometry/extensions/gis/geographic/strategies/andoyer.hpp
+++ b/include/boost/geometry/extensions/gis/geographic/strategies/andoyer.hpp
@@ -198,7 +198,7 @@ struct result_from_distance<andoyer<RadiusType, CalculationType>, P1, P2>
 
 
 template <typename Point1, typename Point2>
-struct default_strategy<point_tag, Point1, Point2, geographic_tag, geographic_tag>
+struct default_strategy<point_tag, point_tag, Point1, Point2, geographic_tag, geographic_tag>
 {
     typedef strategy::distance::andoyer<typename select_coordinate_type<Point1, Point2>::type> type;
 };
diff --git a/include/boost/geometry/extensions/gis/geographic/strategies/distance_cross_track.hpp b/include/boost/geometry/extensions/gis/geographic/strategies/distance_cross_track.hpp
index da1a27256..4e00c4b74 100644
--- a/include/boost/geometry/extensions/gis/geographic/strategies/distance_cross_track.hpp
+++ b/include/boost/geometry/extensions/gis/geographic/strategies/distance_cross_track.hpp
@@ -31,7 +31,7 @@ namespace services
 
 
 template <typename Point, typename PointOfSegment, typename Strategy>
-struct default_strategy<segment_tag, Point, PointOfSegment, geographic_tag, geographic_tag, Strategy>
+struct default_strategy<point_tag, segment_tag, Point, PointOfSegment, geographic_tag, geographic_tag, Strategy>
 {
     typedef cross_track
         <
@@ -41,7 +41,7 @@ struct default_strategy<segment_tag, Point, PointOfSegment, geographic_tag, geog
                     boost::is_void<Strategy>,
                     typename default_strategy
                         <
-                            point_tag, Point, PointOfSegment,
+                            point_tag, point_tag, Point, PointOfSegment,
                             geographic_tag, geographic_tag
                         >::type,
                     Strategy
diff --git a/include/boost/geometry/extensions/nsphere/algorithms/within.hpp b/include/boost/geometry/extensions/nsphere/algorithms/within.hpp
index d28ea42ae..19005d354 100644
--- a/include/boost/geometry/extensions/nsphere/algorithms/within.hpp
+++ b/include/boost/geometry/extensions/nsphere/algorithms/within.hpp
@@ -53,7 +53,7 @@ inline bool point_in_circle(P const& p, C const& c)
     typedef typename point_type<C>::type point_type;
     typedef typename services::default_strategy
         <
-            point_tag, P, point_type
+            point_tag, point_tag, P, point_type
         >::type strategy_type;
     typedef typename services::return_type<strategy_type, P, point_type>::type return_type;