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