diff --git a/docs/reports/kernel.txt b/docs/reports/kernel.txt
index 16362d899..b21f6bd97 100644
--- a/docs/reports/kernel.txt
+++ b/docs/reports/kernel.txt
@@ -236,13 +236,13 @@ Platform : MSP430
 OS Setup : Full kernel
 Compiler : msp430-gcc (GCC) 3.2.3
 Options  : -O2 -DCH_OPTIMIZE_SPEED=TRUE
-Kernel Size = 5636
+Kernel Size = 5632
 
 Platform : MSP430
 OS Setup : Full kernel
 Compiler : msp430-gcc (GCC) 3.2.3
 Options  : -O2 -DCH_OPTIMIZE_SPEED=FALSE
-Kernel Size = 5120
+Kernel Size = 5116
 
 Platform : MSP430
 OS Setup : Minimal kernel
@@ -254,13 +254,13 @@ Platform : MSP430
 OS Setup : Full kernel
 Compiler : msp430-gcc (GCC) 3.2.3
 Options  : -Os -DCH_OPTIMIZE_SPEED=TRUE
-Kernel Size = 5572
+Kernel Size = 5568
 
 Platform : MSP430
 OS Setup : Full kernel
 Compiler : msp430-gcc (GCC) 3.2.3
 Options  : -Os -DCH_OPTIMIZE_SPEED=FALSE
-Kernel Size = 5076
+Kernel Size = 5072
 
 Platform : MSP430
 OS Setup : Minimal kernel
diff --git a/os/kernel/src/chcond.c b/os/kernel/src/chcond.c
index 372b9b2f1..a78ff4ec5 100644
--- a/os/kernel/src/chcond.c
+++ b/os/kernel/src/chcond.c
@@ -218,8 +218,8 @@ msg_t chCondWaitTimeoutS(CondVar *cp, systime_t time) {
   mp = chMtxUnlockS();
   ctp->p_u.wtobjp = cp;
   prio_insert(ctp, &cp->c_queue);
-  chSchGoSleepTimeoutS(THD_STATE_WTCOND, time);
-  msg = ctp->p_u.rdymsg;
+  msg = chSchGoSleepTimeoutS(THD_STATE_WTCOND, time);
+//  msg = ctp->p_u.rdymsg;
   chMtxLockS(mp);
   return msg;
 }