Index: libcfa/src/concurrency/future.hfa
===================================================================
--- libcfa/src/concurrency/future.hfa	(revision 11f92facd3b007ccaf87a75a78f07dfb3c024fc4)
+++ libcfa/src/concurrency/future.hfa	(revision c3d0182ad882b6ff57011d71000ba4e73314ce82)
@@ -9,7 +9,7 @@
 // Author           : Thierry Delisle & Peiran Hong & Colby Parsons
 // Created On       : Wed Jan 06 17:33:18 2021
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Nov 29 16:07:34 2024
-// Update Count     : 30
+// Last Modified By : Kyoung Seo
+// Last Modified On : Mon Jan 27 20:35:00 2025
+// Update Count     : 3
 //
 
@@ -260,5 +260,5 @@
 			if( this.has_first != false) abort("Attempting to reset a multi_future with at least one blocked threads");
 			if( !is_empty(this.blocked) ) abort("Attempting to reset a multi_future with multiple blocked threads");
-			reset( (future_t&)this );
+			reset( (future_t&)*(&this+sizeof(monitor$)) );
 		}
 
@@ -266,5 +266,5 @@
 		bool fulfil( multi_future(T) & this, T result ) {
 			this.result = result;
-			return fulfil( (future_t&)this ) != 0p;
+			return fulfil( (future_t&)*(&this+sizeof(monitor$)) ) != 0p;
 		}
 
@@ -275,5 +275,5 @@
 			bool w = !sw;
 			if ( sw ) {
-				w = wait( (future_t&)this );
+				w = wait( (future_t&)*(&this+sizeof(monitor$)) );
 				$first_done( this );
 			}
Index: libcfa/src/concurrency/pthread.cfa
===================================================================
--- libcfa/src/concurrency/pthread.cfa	(revision 11f92facd3b007ccaf87a75a78f07dfb3c024fc4)
+++ libcfa/src/concurrency/pthread.cfa	(revision c3d0182ad882b6ff57011d71000ba4e73314ce82)
@@ -9,6 +9,6 @@
 // Author           : Zhenyan Zhu
 // Created On       : Sat Aug 6 16:29:18 2022
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Sep  4 15:37:51 2023
+// Last Modified By : Kyoung Seo
+// Last Modified On : Mon Jan 27 20:35:00 2025
 // Update Count     : 1
 //
@@ -392,5 +392,5 @@
 
 	pthread_t pthread_self(void) libcfa_public __THROW {
-		return (pthread_t)((uintptr_t)active_thread() - (sizeof(cfaPthread) - sizeof(thread$)));
+		return (pthread_t)((uintptr_t)active_thread());
 	}
 
Index: src/Concurrency/Keywords.cpp
===================================================================
--- src/Concurrency/Keywords.cpp	(revision 11f92facd3b007ccaf87a75a78f07dfb3c024fc4)
+++ src/Concurrency/Keywords.cpp	(revision c3d0182ad882b6ff57011d71000ba4e73314ce82)
@@ -10,6 +10,6 @@
 // Created On       : Tue Nov 16  9:53:00 2021
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sun Jan 26 15:16:16 2025
-// Update Count     : 15
+// Last Modified On : Fri Jan 24 18:33:02 2025
+// Update Count     : 14
 //
 
@@ -534,6 +534,5 @@
 	auto mutDecl = ast::mutate( decl );
 	// Insert at start of special aggregate structures => front of vector
-	//mutDecl->members.insert( mutDecl->members.begin(), field );
-	mutDecl->members.push_back( field );
+	mutDecl->members.insert( mutDecl->members.begin(), field );
 
 	return {mutDecl, field};