Index: libcfa/src/concurrency/coroutine.hfa
===================================================================
--- libcfa/src/concurrency/coroutine.hfa	(revision 578ec01c03b3607787fd53ea4cd57da1268ba81a)
+++ libcfa/src/concurrency/coroutine.hfa	(revision eaf269d21f42f861fd9f29749c414742326bf919)
@@ -10,6 +10,6 @@
 // Created On       : Mon Nov 28 12:27:26 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Feb  4 12:29:26 2020
-// Update Count     : 11
+// Last Modified On : Thu Jan  6 16:33:16 2022
+// Update Count     : 12
 //
 
@@ -155,5 +155,5 @@
 
 	if( unlikely(dst->context.SP == 0p) ) {
-		__stack_prepare(&dst->stack, 65000);
+		__stack_prepare(&dst->stack, DEFAULT_STACK_SIZE);
 		__cfactx_start(main, dst, cor, __cfactx_invoke_coroutine);
 	}
Index: libcfa/src/concurrency/invoke.h
===================================================================
--- libcfa/src/concurrency/invoke.h	(revision 578ec01c03b3607787fd53ea4cd57da1268ba81a)
+++ libcfa/src/concurrency/invoke.h	(revision eaf269d21f42f861fd9f29749c414742326bf919)
@@ -10,6 +10,6 @@
 // Created On       : Tue Jan 17 12:27:26 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Dec  5 16:26:03 2019
-// Update Count     : 44
+// Last Modified On : Thu Jan  6 16:37:40 2022
+// Update Count     : 47
 //
 
@@ -27,4 +27,6 @@
 #ifndef _INVOKE_H_
 #define _INVOKE_H_
+
+	enum { DEFAULT_STACK_SIZE = 65000 };
 
 	struct __cfaehm_try_resume_node;
Index: libcfa/src/concurrency/kernel/startup.cfa
===================================================================
--- libcfa/src/concurrency/kernel/startup.cfa	(revision 578ec01c03b3607787fd53ea4cd57da1268ba81a)
+++ libcfa/src/concurrency/kernel/startup.cfa	(revision eaf269d21f42f861fd9f29749c414742326bf919)
@@ -403,5 +403,5 @@
 
 	__cfaabi_tls.this_thread->curr_cor = dst;
-	__stack_prepare( &dst->stack, 65000 );
+	__stack_prepare( &dst->stack, DEFAULT_STACK_SIZE );
 	__cfactx_start(main, dst, this->runner, __cfactx_invoke_coroutine);
 
@@ -721,8 +721,5 @@
 	check( pthread_attr_init( &attr ), "pthread_attr_init" ); // initialize attribute
 
-	size_t stacksize;
-	// default stack size, normally defined by shell limit
-	check( pthread_attr_getstacksize( &attr, &stacksize ), "pthread_attr_getstacksize" );
-	assert( stacksize >= PTHREAD_STACK_MIN );
+	size_t stacksize = DEFAULT_STACK_SIZE;
 
 	void * stack;
@@ -749,7 +746,5 @@
 	#endif
 
-
 	check( pthread_attr_setstack( &attr, stack, stacksize ), "pthread_attr_setstack" );
-
 	check( pthread_create( pthread, &attr, start, arg ), "pthread_create" );
 	return stack;
Index: libcfa/src/concurrency/thread.hfa
===================================================================
--- libcfa/src/concurrency/thread.hfa	(revision 578ec01c03b3607787fd53ea4cd57da1268ba81a)
+++ libcfa/src/concurrency/thread.hfa	(revision eaf269d21f42f861fd9f29749c414742326bf919)
@@ -10,6 +10,6 @@
 // Created On       : Tue Jan 17 12:27:26 2017
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Dec  4 09:18:14 2019
-// Update Count     : 6
+// Last Modified On : Thu Jan  6 16:40:16 2022
+// Update Count     : 7
 //
 
@@ -65,12 +65,12 @@
 void ^?{}(thread$ & this);
 
-static inline void ?{}(thread$ & this)                                                                  { this{ "Anonymous Thread", *mainCluster, 0p, 65000 }; }
+static inline void ?{}(thread$ & this)                                                                  { this{ "Anonymous Thread", *mainCluster, 0p, DEFAULT_STACK_SIZE }; }
 static inline void ?{}(thread$ & this, size_t stackSize )                                               { this{ "Anonymous Thread", *mainCluster, 0p, stackSize }; }
 static inline void ?{}(thread$ & this, void * storage, size_t storageSize )                             { this{ "Anonymous Thread", *mainCluster, storage, storageSize }; }
-static inline void ?{}(thread$ & this, struct cluster & cl )                                            { this{ "Anonymous Thread", cl, 0p, 65000 }; }
+static inline void ?{}(thread$ & this, struct cluster & cl )                                            { this{ "Anonymous Thread", cl, 0p, DEFAULT_STACK_SIZE }; }
 static inline void ?{}(thread$ & this, struct cluster & cl, size_t stackSize )                          { this{ "Anonymous Thread", cl, 0p, stackSize }; }
 static inline void ?{}(thread$ & this, struct cluster & cl, void * storage, size_t storageSize )        { this{ "Anonymous Thread", cl, storage, storageSize }; }
-static inline void ?{}(thread$ & this, const char * const name)                                         { this{ name, *mainCluster, 0p, 65000 }; }
-static inline void ?{}(thread$ & this, const char * const name, struct cluster & cl )                   { this{ name, cl, 0p, 65000 }; }
+static inline void ?{}(thread$ & this, const char * const name)                                         { this{ name, *mainCluster, 0p, DEFAULT_STACK_SIZE }; }
+static inline void ?{}(thread$ & this, const char * const name, struct cluster & cl )                   { this{ name, cl, 0p, DEFAULT_STACK_SIZE }; }
 static inline void ?{}(thread$ & this, const char * const name, struct cluster & cl, size_t stackSize ) { this{ name, cl, 0p, stackSize }; }