Index: generic/src/proc/scheduler.c
===================================================================
--- generic/src/proc/scheduler.c	(revision bb68433fea16aec0b0b4240149c9c3e8fb347b34)
+++ generic/src/proc/scheduler.c	(revision bfb87dfa5a2db236f9520a16f8ba1d59d1d9c11c)
@@ -328,5 +328,5 @@
 			 * Replace the old one with the new one.
 			 */
-			as_install(as2);
+			as_switch(as1, as2);
 		}
 		TASK = THREAD->task;	
@@ -336,5 +336,5 @@
 
 	#ifdef SCHEDULER_VERBOSE
-	printf("cpu%d: tid %d (priority=%d,ticks=%d,nrdy=%d)\n", CPU->id, THREAD->tid, THREAD->priority, THREAD->ticks, CPU->nrdy);
+	printf("cpu%d: tid %d (priority=%d,ticks=%d,nrdy=%d)\n", CPU->id, THREAD->tid, THREAD->priority, THREAD->ticks, atomic_get(&CPU->nrdy));
 	#endif