diff --git a/cJSON.c b/cJSON.c
index e386dcf..2862fd4 100644
--- a/cJSON.c
+++ b/cJSON.c
@@ -119,13 +119,13 @@ static int case_insensitive_strcmp(const unsigned char *string1, const unsigned
 typedef struct internal_context
 {
     size_t buffer_size;
+    size_t end_position;
+    void *userdata;
+    cJSON_Allocators allocators;
     cJSON_bool format;
     cJSON_bool allow_data_after_json;
     cJSON_bool case_sensitive;
     cJSON_bool duplicate_recursive;
-    cJSON_Allocators allocators;
-    void *userdata;
-    size_t end_position;
 } internal_context;
 
 #if defined(_MSC_VER)
@@ -194,17 +194,17 @@ static void deallocate(const internal_context * const context, void *pointer)
 
 #define default_context {\
     256, /* default buffer size */\
-    true, /* enable formatting by default */\
-    true, /* allow data after the JSON by default */\
-    true, /* case sensitive by default */\
-    true, /* Do cJSON_Duplicate recursively by default */\
+    0, /* default end position */\
+    NULL, /* no userdata */\
     {\
         malloc_wrapper,\
         free_wrapper,\
         realloc_wrapper\
     },\
-    NULL, /* no userdata */\
-    0 /* default end position */\
+    true, /* enable formatting by default */\
+    true, /* allow data after the JSON by default */\
+    true, /* case sensitive by default */\
+    true /* Do cJSON_Duplicate recursively by default */\
 }
 
 /* this is necessary to assign the default context after initialization */
diff --git a/tests/misc_tests.c b/tests/misc_tests.c
index 57e9b2d..8cb4f88 100644
--- a/tests/misc_tests.c
+++ b/tests/misc_tests.c
@@ -419,7 +419,7 @@ static void *failing_realloc(void *pointer, size_t size, void *userdata)
 
 static void ensure_should_fail_on_failed_realloc(void)
 {
-    printbuffer buffer = {NULL, 10, 0, 0, false, {256, false, true, true, true, {malloc_wrapper, free_wrapper, failing_realloc}, NULL, 0 } };
+    printbuffer buffer = {NULL, 10, 0, 0, false, {256, 0, NULL, {malloc_wrapper, free_wrapper, failing_realloc}, false, true, true, true} };
     buffer.context.userdata = &buffer;
     buffer.buffer = (unsigned char*)malloc(100);
     TEST_ASSERT_NOT_NULL(buffer.buffer);