diff --git a/routed.cpp b/routed.cpp
index 90dba245f..b4404c12e 100644
--- a/routed.cpp
+++ b/routed.cpp
@@ -77,7 +77,7 @@ int main(int argc, const char *argv[]) try
     LibOSRMConfig lib_config;
     const unsigned init_result = GenerateServerProgramOptions(
         argc, argv, lib_config.server_paths, ip_address, ip_port, requested_thread_num,
-        lib_config.use_shared_memory, trial_run, lib_config.max_locations_viaroute, lib_config.max_locations_trip,
+        lib_config.use_shared_memory, trial_run, lib_config.max_locations_trip, lib_config.max_locations_viaroute,
         lib_config.max_locations_distance_table,
         lib_config.max_locations_map_matching);
     if (init_result == INIT_OK_DO_NOT_START_ENGINE)
diff --git a/tools/simpleclient.cpp b/tools/simpleclient.cpp
index 186d33cf7..17058a641 100644
--- a/tools/simpleclient.cpp
+++ b/tools/simpleclient.cpp
@@ -43,13 +43,14 @@ int main(int argc, const char *argv[])
     try
     {
         std::string ip_address;
-        int ip_port, requested_thread_num, max_locations_map_matching;
+        int ip_port, requested_thread_num;
         bool trial_run = false;
         LibOSRMConfig lib_config;
         const unsigned init_result = GenerateServerProgramOptions(
             argc, argv, lib_config.server_paths, ip_address, ip_port, requested_thread_num,
-            lib_config.use_shared_memory, trial_run, lib_config.max_locations_distance_table,
-            max_locations_map_matching);
+            lib_config.use_shared_memory, trial_run, lib_config.max_locations_trip,
+            lib_config.max_locations_viaroute, lib_config.max_locations_distance_table,
+            lib_config.max_locations_map_matching);
 
         if (init_result == INIT_OK_DO_NOT_START_ENGINE)
         {