diff --git a/Descriptors/JSONDescriptor.h b/Descriptors/JSONDescriptor.h
index ddddc1403..5437004ae 100644
--- a/Descriptors/JSONDescriptor.h
+++ b/Descriptors/JSONDescriptor.h
@@ -39,6 +39,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "../Util/StringUtil.h"
 #include "../Util/TimingUtil.h"
 
+#include <boost/range/irange.hpp>
+
 #include <algorithm>
 
 template <class DataFacadeT> class JSONDescriptor : public BaseDescriptor<DataFacadeT>
@@ -118,14 +120,14 @@ template <class DataFacadeT> class JSONDescriptor : public BaseDescriptor<DataFa
         json_result.values["status_message"] = "Found route between points";
 
         // for each unpacked segment add the leg to the description
-        for (unsigned i = 0; i < raw_route.unpacked_path_segments.size(); ++i)
+        for (const auto i : boost::irange((std::size_t)0, raw_route.unpacked_path_segments.size()))
         {
 #ifndef NDEBUG
             const int added_segments =
 #endif
-                DescribeLeg(raw_route.unpacked_path_segments[i],
-                            raw_route.segment_end_coordinates[i],
-                            raw_route.target_traversed_in_reverse[i]);
+            DescribeLeg(raw_route.unpacked_path_segments[i],
+                        raw_route.segment_end_coordinates[i],
+                        raw_route.target_traversed_in_reverse[i]);
             BOOST_ASSERT(0 < added_segments);
         }
         description_factory.Run(facade, config.zoom_level);
@@ -276,7 +278,7 @@ template <class DataFacadeT> class JSONDescriptor : public BaseDescriptor<DataFa
         json_hint_object.values["checksum"] = raw_route.check_sum;
         JSON::Array json_location_hint_array;
         std::string hint;
-        for (unsigned i = 0; i < raw_route.segment_end_coordinates.size(); ++i)
+        for (const auto i : boost::irange((std::size_t)0, raw_route.segment_end_coordinates.size()))
         {
             EncodeObjectToBase64(raw_route.segment_end_coordinates[i].source_phantom, hint);
             json_location_hint_array.values.push_back(hint);
@@ -365,21 +367,17 @@ template <class DataFacadeT> class JSONDescriptor : public BaseDescriptor<DataFa
             }
         }
 
-        // TODO: check if this in an invariant
-        if (INVALID_EDGE_WEIGHT != route_length)
-        {
-            JSON::Array json_last_instruction_row;
-            temp_instruction = IntToString(as_integer(TurnInstruction::ReachedYourDestination));
-            json_last_instruction_row.values.push_back(temp_instruction);
-            json_last_instruction_row.values.push_back("");
-            json_last_instruction_row.values.push_back(0);
-            json_last_instruction_row.values.push_back(necessary_segments_running_index - 1);
-            json_last_instruction_row.values.push_back(0);
-            json_last_instruction_row.values.push_back("0m");
-            json_last_instruction_row.values.push_back(Azimuth::Get(0.0));
-            json_last_instruction_row.values.push_back(0.);
-            json_instruction_array.values.push_back(json_last_instruction_row);
-        }
+        JSON::Array json_last_instruction_row;
+        temp_instruction = IntToString(as_integer(TurnInstruction::ReachedYourDestination));
+        json_last_instruction_row.values.push_back(temp_instruction);
+        json_last_instruction_row.values.push_back("");
+        json_last_instruction_row.values.push_back(0);
+        json_last_instruction_row.values.push_back(necessary_segments_running_index - 1);
+        json_last_instruction_row.values.push_back(0);
+        json_last_instruction_row.values.push_back("0m");
+        json_last_instruction_row.values.push_back(Azimuth::Get(0.0));
+        json_last_instruction_row.values.push_back(0.);
+        json_instruction_array.values.push_back(json_last_instruction_row);
     }
 };