diff --git a/Plugins/NearestPlugin.h b/Plugins/NearestPlugin.h
index f8a3c8cc8..0a2853f24 100644
--- a/Plugins/NearestPlugin.h
+++ b/Plugins/NearestPlugin.h
@@ -75,7 +75,7 @@ template <class DataFacadeT> class NearestPlugin : public BasePlugin
                 JSON::Array results;
                 
                 int vector_length = phantom_node_vector.size();
-                for (int i = 0; i < number_of_results && i < vector_length; i++)
+                for (const auto i : osrm::irange<std::size_t>(0, std::min(number_of_results, vector_length)))
                 {
                     JSON::Array json_coordinate;
                     JSON::Object result;