Index: libcfa/src/concurrency/kernel/startup.cfa
===================================================================
--- libcfa/src/concurrency/kernel/startup.cfa	(revision 0a061c0cdfdeb60d832f68c1a15164a83849766f)
+++ libcfa/src/concurrency/kernel/startup.cfa	(revision eb2cfbfd758ec185db64d7693e39a0938b9ea42e)
@@ -235,4 +235,5 @@
 
 	register_tls( mainProcessor );
+	mainThread->last_cpu = __kernel_getcpu();
 
 	//initialize the global state variables
@@ -478,5 +479,4 @@
 	state = Start;
 	self_cor{ info };
-	last_cpu = __kernel_getcpu();
 	curr_cor = &self_cor;
 	curr_cluster = mainCluster;
Index: libcfa/src/concurrency/thread.cfa
===================================================================
--- libcfa/src/concurrency/thread.cfa	(revision 0a061c0cdfdeb60d832f68c1a15164a83849766f)
+++ libcfa/src/concurrency/thread.cfa	(revision eb2cfbfd758ec185db64d7693e39a0938b9ea42e)
@@ -34,5 +34,7 @@
 	preempted = __NO_PREEMPTION;
 	corctx_flag = false;
+	disable_interrupts();
 	last_cpu = __kernel_getcpu();
+	enable_interrupts();
 	curr_cor = &self_cor;
 	self_mon.owner = &this;