diff --git a/src/thread/thread.c b/src/thread/thread.c
index f7038ca..cc5b072 100644
--- a/src/thread/thread.c
+++ b/src/thread/thread.c
@@ -345,7 +345,7 @@ void __attribute__((constructor)) setup_main_thread()
     // Create an entry for the main thread.
 
     struct context_entry_t *new_entry;
-    for (int i = 0; i < 1000; ++i) {
+    for (int i = 0; i < 4000; ++i) {
 
         new_entry = malloc(sizeof(*new_entry));
         memset(new_entry->stack, 0, STACK_SIZE);
@@ -358,6 +358,9 @@ void __attribute__((constructor)) setup_main_thread()
         new_entry->valgrind_id = VALGRIND_STACK_REGISTER(
             new_entry->context.uc_stack.ss_sp,
             new_entry->context.uc_stack.ss_sp + new_entry->context.uc_stack.ss_size);
+        new_entry->last_waited = NULL;
+        new_entry->retvalue = NULL;
+        new_entry->status = 0;
         TAILQ_INSERT_TAIL(&context_to_freed, new_entry, link);
     }