diff --git a/tools/grib_ls.c b/tools/grib_ls.c
index f755d588f..c307e8ed1 100644
--- a/tools/grib_ls.c
+++ b/tools/grib_ls.c
@@ -156,14 +156,14 @@ int grib_tool_init(grib_runtime_options* options)
 
         options->latlon_idx = -1;
         max                 = options->distances[0];
-        for (i = 0; i < 4; i++)
+        for (i = 0; i < LATLON_SIZE; i++)
             if (max < options->distances[i]) {
                 max = options->distances[i];
             }
         min         = max;
         min_overall = max;
         /* See GRIB-213 */
-        for (i = 0; i < 4; i++) {
+        for (i = 0; i < LATLON_SIZE; i++) {
             if (min_overall >= options->distances[i]) { /* find overall min and index ignoring mask */
                 min_overall = options->distances[i];
                 idx_overall = i;
@@ -184,7 +184,7 @@ int grib_tool_init(grib_runtime_options* options)
         if (options->latlon_idx < 0) {
             min                 = 0;
             options->latlon_idx = 0;
-            for (i = 1; i < 4; i++)
+            for (i = 1; i < LATLON_SIZE; i++)
                 if (min > options->distances[i]) {
                     min                 = options->distances[i];
                     options->latlon_idx = i;
@@ -307,7 +307,7 @@ int grib_tool_new_handle_action(grib_runtime_options* options, grib_handle* h)
         if (!options->latlon_mask) {
             min                 = options->distances[0];
             options->latlon_idx = 0;
-            for (i = 1; i < 4; i++) {
+            for (i = 1; i < LATLON_SIZE; i++) {
                 if (min > options->distances[i]) {
                     min                 = options->distances[i];
                     options->latlon_idx = i;
@@ -330,7 +330,7 @@ int grib_tool_new_handle_action(grib_runtime_options* options, grib_handle* h)
             else
                 printf("\"nearest\"");
             printf("\n, \"neighbours\" : ");
-            for (i = 0; i < 4; i++) {
+            for (i = 0; i < LATLON_SIZE; i++) {
                 printf("%s", s);
                 len = MAX_STRING_LEN;
                 printf(
@@ -398,7 +398,7 @@ int grib_tool_finalise_action(grib_runtime_options* options)
     int i = 0;
     if (options->latlon && options->verbose) {
         printf("Input Point: latitude=%.2f  longitude=%.2f\n", lat, lon);
-        if (options->latlon_idx >= 0 && options->latlon_idx < 4) {
+        if (options->latlon_idx >= 0 && options->latlon_idx < LATLON_SIZE) {
             printf("Grid Point chosen #%d index=%d latitude=%.2f longitude=%.2f distance=%.2f (Km)\n",
                 options->latlon_idx + 1, (int)options->indexes[options->latlon_idx],
                 options->lats[options->latlon_idx],
@@ -407,7 +407,7 @@ int grib_tool_finalise_action(grib_runtime_options* options)
         }
         if (options->latlon_mask) {
             printf("Mask values:\n");
-            for (i = 0; i < 4; i++) {
+            for (i = 0; i < LATLON_SIZE; i++) {
                 printf("- %d - index=%d latitude=%.2f longitude=%.2f distance=%.2f (Km) value=%.2f\n",
                        i + 1, (int)options->indexes[i], options->lats[i], options->lons[i],
                        options->distances[i], options->mask_values[i]);
@@ -415,7 +415,7 @@ int grib_tool_finalise_action(grib_runtime_options* options)
         }
         else {
             printf("Other grid Points\n");
-            for (i = 0; i < 4; i++) {
+            for (i = 0; i < LATLON_SIZE; i++) {
                 printf("- %d - index=%d latitude=%.2f longitude=%.2f distance=%.2f (Km)\n",
                        i + 1, (int)options->indexes[i], options->lats[i], options->lons[i],
                        options->distances[i]);
diff --git a/tools/grib_tools.c b/tools/grib_tools.c
index 59f472b17..385709282 100644
--- a/tools/grib_tools.c
+++ b/tools/grib_tools.c
@@ -1170,7 +1170,7 @@ void grib_print_key_values(grib_runtime_options* options, grib_handle* h)
     if (options->latlon) {
         if (options->latlon_mode == 4) {
             int ii = 0;
-            for (ii = 0; ii < 4; ii++) {
+            for (ii = 0; ii < LATLON_SIZE; ii++) {
                 fprintf(dump_file, options->format, options->values[ii]);
                 fprintf(dump_file, " ");
             }
diff --git a/tools/grib_tools.h b/tools/grib_tools.h
index b49e86f6b..445179d7c 100644
--- a/tools/grib_tools.h
+++ b/tools/grib_tools.h
@@ -37,6 +37,7 @@
 #define MAX_STRING_LEN 512
 #define MAX_FAILED 1024
 #define MAX_CONSTRAINT_VALUES 500
+#define LATLON_SIZE 4 /* nearest */
 
 #define MODE_GRIB 0
 #define MODE_GTS 1
@@ -140,15 +141,15 @@ typedef struct grib_runtime_options
     int gts;
     char* orderby;
     char* latlon;
-    double lats[4];
-    double lons[4];
-    double values[4];
-    double distances[4];
-    int indexes[4];
+    double lats[LATLON_SIZE];
+    double lons[LATLON_SIZE];
+    double values[LATLON_SIZE];
+    double distances[LATLON_SIZE];
+    int indexes[LATLON_SIZE];
     int latlon_mode;
     char* latlon_mask;
     int latlon_idx;
-    double mask_values[4];
+    double mask_values[LATLON_SIZE];
     int index;
     int index_on;
     double constant;