diff --git a/benchmarks/dbscan/ArborX_DBSCANVerification.hpp b/benchmarks/dbscan/ArborX_DBSCANVerification.hpp
index 30ddc6c5e..077167ea3 100644
--- a/benchmarks/dbscan/ArborX_DBSCANVerification.hpp
+++ b/benchmarks/dbscan/ArborX_DBSCANVerification.hpp
@@ -298,7 +298,7 @@ bool verifyDBSCAN(ExecutionSpace exec_space, Primitives const &primitives,
 
   static_assert(Kokkos::is_view<LabelsView>{});
 
-  using Points = Details::AccessValues<Primitives>;
+  using Points = Details::AccessValues<Primitives, PrimitivesTag>;
   using MemorySpace = typename Points::memory_space;
 
   static_assert(std::is_same<typename LabelsView::value_type, int>{});
diff --git a/src/ArborX_BruteForce.hpp b/src/ArborX_BruteForce.hpp
index 9ea39a962..15e648afc 100644
--- a/src/ArborX_BruteForce.hpp
+++ b/src/ArborX_BruteForce.hpp
@@ -189,7 +189,7 @@ BruteForce<MemorySpace, Value, IndexableGetter, BoundingVolume>::BruteForce(
   Details::check_valid_access_traits<UserValues>(
       PrimitivesTag{}, user_values, Details::DoNotCheckGetReturnType());
 
-  using Values = Details::AccessValues<UserValues>;
+  using Values = Details::AccessValues<UserValues, PrimitivesTag>;
   Values values{user_values};
 
   static_assert(KokkosExt::is_accessible_from<typename Values::memory_space,
diff --git a/src/ArborX_DBSCAN.hpp b/src/ArborX_DBSCAN.hpp
index be87d898b..26a4ea794 100644
--- a/src/ArborX_DBSCAN.hpp
+++ b/src/ArborX_DBSCAN.hpp
@@ -239,7 +239,7 @@ dbscan(ExecutionSpace const &exec_space, Primitives const &primitives,
 {
   Kokkos::Profiling::pushRegion("ArborX::DBSCAN");
 
-  using Points = Details::AccessValues<Primitives>;
+  using Points = Details::AccessValues<Primitives, PrimitivesTag>;
   using MemorySpace = typename Points::memory_space;
 
   static_assert(
diff --git a/src/ArborX_LinearBVH.hpp b/src/ArborX_LinearBVH.hpp
index 920da2f77..415a5b410 100644
--- a/src/ArborX_LinearBVH.hpp
+++ b/src/ArborX_LinearBVH.hpp
@@ -265,7 +265,7 @@ BoundingVolumeHierarchy<MemorySpace, Value, IndexableGetter, BoundingVolume>::
   Details::check_valid_access_traits<UserValues>(
       PrimitivesTag{}, user_values, Details::DoNotCheckGetReturnType());
 
-  using Values = Details::AccessValues<UserValues>;
+  using Values = Details::AccessValues<UserValues, PrimitivesTag>;
   Values values{user_values};
 
   static_assert(KokkosExt::is_accessible_from<typename Values::memory_space,
diff --git a/src/details/ArborX_AccessTraits.hpp b/src/details/ArborX_AccessTraits.hpp
index 015a65a41..64d7f4c64 100644
--- a/src/details/ArborX_AccessTraits.hpp
+++ b/src/details/ArborX_AccessTraits.hpp
@@ -199,7 +199,7 @@ void check_valid_access_traits(PrimitivesTag, Primitives const &,
   }
 }
 
-template <typename Values, typename Tag = PrimitivesTag>
+template <typename Values, typename Tag>
 class AccessValues
 {
 private:
diff --git a/src/details/ArborX_MinimumSpanningTree.hpp b/src/details/ArborX_MinimumSpanningTree.hpp
index 2abce1566..b931a0f40 100644
--- a/src/details/ArborX_MinimumSpanningTree.hpp
+++ b/src/details/ArborX_MinimumSpanningTree.hpp
@@ -48,7 +48,7 @@ struct MinimumSpanningTree
   {
     Kokkos::Profiling::pushRegion("ArborX::MST::MST");
 
-    using Points = Details::AccessValues<Primitives>;
+    using Points = Details::AccessValues<Primitives, PrimitivesTag>;
     using Point = typename Points::value_type;
     static_assert(GeometryTraits::is_point<Point>{});