diff --git a/src/distributed_io.c b/src/distributed_io.c
index 95554338540a6434c5f20b2776958a13a3fad89d..bee5b415dfe7562c89b062ea122a0f2b75c4b02d 100644
--- a/src/distributed_io.c
+++ b/src/distributed_io.c
@@ -706,8 +706,7 @@ void write_output_distributed(struct engine* e,
 
     /* Write everything that is not cancelled */
 
-    char current_selection_name[OUTPUT_LIST_SELECT_OUTPUT_MAX_LENGTH] =
-        "Default";
+    char current_selection_name[FIELD_BUFFER_SIZE] = "Default";
     if (output_list->output_list_on) {
       /* Users could have specified a different Select Output scheme for each
        * snapshot. */
diff --git a/src/parallel_io.c b/src/parallel_io.c
index 7056d7b3d5f84cc23fe7903b5eeaa3a1011c8d96..eab2a820f0d65d7dc5c567b22ead1b68dcfca09a 100644
--- a/src/parallel_io.c
+++ b/src/parallel_io.c
@@ -1260,8 +1260,7 @@ void prepare_file(struct engine* e, const char* fileName,
 
     /* Prepare everything that is not cancelled */
 
-    char current_selection_name[OUTPUT_LIST_SELECT_OUTPUT_MAX_LENGTH] =
-        "Default";
+    char current_selection_name[FIELD_BUFFER_SIZE] = "Default";
     if (output_list->output_list_on) {
       /* Users could have specified a different Select Output scheme for each
        * snapshot. */
@@ -1777,8 +1776,7 @@ void write_output_parallel(struct engine* e,
     }
 
     /* Write everything that is not cancelled */
-    char current_selection_name[OUTPUT_LIST_SELECT_OUTPUT_MAX_LENGTH] =
-        "Default";
+    char current_selection_name[FIELD_BUFFER_SIZE] = "Default";
     if (output_list->output_list_on) {
       /* Users could have specified a different Select Output scheme for each
        * snapshot. */
diff --git a/src/serial_io.c b/src/serial_io.c
index bf557b6b7ea034d0d413d056ef31af19fd8a4c6b..366c2dbe58eaef8bebbec5b4959563935044e4c0 100644
--- a/src/serial_io.c
+++ b/src/serial_io.c
@@ -1389,8 +1389,7 @@ void write_output_serial(struct engine* e,
 
         /* Write everything that is not cancelled */
 
-        char current_selection_name[OUTPUT_LIST_SELECT_OUTPUT_MAX_LENGTH] =
-            "Default";
+        char current_selection_name[FIELD_BUFFER_SIZE] = "Default";
         if (output_list->output_list_on) {
           /* Users could have specified a different Select Output scheme for
            * each snapshot. */
diff --git a/src/single_io.c b/src/single_io.c
index 8fa113bd58e7300e959f7f490b1ffdc2f0c0ffe0..db19f7f04a693d88288d34ea35761152d7c2ac8f 100644
--- a/src/single_io.c
+++ b/src/single_io.c
@@ -1173,8 +1173,7 @@ void write_output_single(struct engine* e,
 
     /* Write everything that is not cancelled */
 
-    char current_selection_name[OUTPUT_LIST_SELECT_OUTPUT_MAX_LENGTH] =
-        "Default";
+    char current_selection_name[FIELD_BUFFER_SIZE] = "Default";
     if (output_list->output_list_on) {
       /* Users could have specified a different Select Output scheme for each
        * snapshot. */