diff --git a/src/algorithm/ShortestPath/Vehicle/VehicleShortestPathCalculation.cpp b/src/algorithm/ShortestPath/Vehicle/VehicleShortestPathCalculation.cpp
index d7507cb716e0eecdad2dab8d02519e1170d5c3a9..159d27c1965e126ff5c73d1fc404aea98cfffdb4 100644
--- a/src/algorithm/ShortestPath/Vehicle/VehicleShortestPathCalculation.cpp
+++ b/src/algorithm/ShortestPath/Vehicle/VehicleShortestPathCalculation.cpp
@@ -10,7 +10,7 @@
 std::vector<uint>
 VehicleShortestPathCalculation::computeShortestPathsFromNode(Graph &graph, size_t startingNodeIdx, bool useEdges) {
     std::vector<uint> results;
-    results.resize(graph.getNbNodes(), UINT32_MAX);
+    results.resize(graph.getNbNodes(), INT16_MAX);
 
     if(!useEdges) {
         results = graph.getShortestSaevPaths()[startingNodeIdx];
@@ -92,7 +92,7 @@ VehicleShortestPathCalculation::getClosestPTNodesFromX(const Graph &graph, size_
 void VehicleShortestPathCalculation::expandStatesViaMatrix(const VehiclePathState& currentState, std::vector<uint> &results,
                                                            std::priority_queue<VehiclePathState, std::vector<VehiclePathState>, std::greater<>> &stateQueue,
                                                            const Graph& graph) {
-    uint newDistance = INT32_MAX;
+    uint newDistance = INT16_MAX;
     for(size_t i = 0; i < results.capacity(); ++i) {
         newDistance = currentState.getInstant() + graph.getShortestSAEVPath(currentState.getNodeIndex(), i);
         if(newDistance < results[i]) {
@@ -105,7 +105,7 @@ void VehicleShortestPathCalculation::expandStatesViaMatrix(const VehiclePathStat
 void VehicleShortestPathCalculation::expandStatesViaEdges(const VehiclePathState &currentState, std::vector<uint> &results,
                                                           std::priority_queue<VehiclePathState, std::vector<VehiclePathState>, std::greater<>> &stateQueue,
                                                           const Graph& graph) {
-    uint newDistance = INT32_MAX;
+    uint newDistance = INT16_MAX;
     for(const auto& edgeIndex : graph.getNode(currentState.getNodeIndex()).getOutgoingEdges()) {
         const Edge& edge = graph.getEdge(edgeIndex);
         newDistance = currentState.getInstant() + edge.getLength();