diff --git a/CHANGELOG b/CHANGELOG
index e4e84924..167bf000 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -18,6 +18,7 @@ Current head (v.1.2 RC)
     - [fitting] Use variadic template for basket extensions (#85)
     - [fitting] Fix current status issue (#108)
     - [spatialPartitioning] Fix potential compilation issues in KnnGraph (#111) 
+    - [spatialPartitioning] Fix debug macros in KnnGraphRangeQuery (#121)
     - [fitting] Fix sphere fit eigen solver (#112)
 
 -Docs
diff --git a/Ponca/src/SpatialPartitioning/KnnGraph/Query/knnGraphRangeQuery.h b/Ponca/src/SpatialPartitioning/KnnGraph/Query/knnGraphRangeQuery.h
index 4c62a118..24bd8ed3 100644
--- a/Ponca/src/SpatialPartitioning/KnnGraph/Query/knnGraphRangeQuery.h
+++ b/Ponca/src/SpatialPartitioning/KnnGraph/Query/knnGraphRangeQuery.h
@@ -75,13 +75,13 @@ class KnnGraphRangeQuery : public RangeIndexQuery<typename Traits::IndexType, ty
             int idx_current = m_stack.top();
             m_stack.pop();
 
-            PONCA_DEBUG_ASSERT((point - points[idx_current]).squaredNorm() < m_squared_radius);
+            PONCA_DEBUG_ASSERT((point - points[idx_current].pos()).squaredNorm() < QueryType::squared_radius());
 
             iterator.m_index = idx_current;
 
             for(int idx_nei : m_graph->k_nearest_neighbors(idx_current))
             {
-                PONCA_DEBUG_ASSERT(idx_nei>0);
+                PONCA_DEBUG_ASSERT(idx_nei>=0);
                 Scalar d  = (point - points[idx_nei].pos()).squaredNorm();
                 Scalar th = QueryType::descentDistanceThreshold();
                 if((point - points[idx_nei].pos()).squaredNorm() < QueryType::descentDistanceThreshold() && m_flag.insert(idx_nei).second)