diff --git a/lib/src/os/__osViSwapContext.c b/lib/src/os/__osViSwapContext.c
index a58302a6..cc2153af 100644
--- a/lib/src/os/__osViSwapContext.c
+++ b/lib/src/os/__osViSwapContext.c
@@ -13,8 +13,8 @@ struct __osThreadTail
 } __osThreadTail;
 
 struct __osThreadTail __osThreadTail = {0, -1};
-OSThread *__osRunQueue = &__osThreadTail.next;
-OSThread *__osActiveQueue = &__osThreadTail.next;
+OSThread *__osRunQueue = (OSThread *)&__osThreadTail;
+OSThread *__osActiveQueue = (OSThread *)&__osThreadTail;
 
 extern OSThread *__osRunningThread = NULL;
 extern OSThread *__osFaultedThread = NULL;