Index: libcfa/src/concurrency/kernel/startup.cfa
===================================================================
--- libcfa/src/concurrency/kernel/startup.cfa	(revision 478c6103a511169384196eb6ac4bf8b72c9d50a9)
+++ libcfa/src/concurrency/kernel/startup.cfa	(revision d874f598f2d1413313b06f3e5509f760af64b3ac)
@@ -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 478c6103a511169384196eb6ac4bf8b72c9d50a9)
+++ libcfa/src/concurrency/thread.cfa	(revision d874f598f2d1413313b06f3e5509f760af64b3ac)
@@ -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;