diff --git a/src/libs/raceengineclient/raceengine.cpp b/src/libs/raceengineclient/raceengine.cpp
index c912d6f2..94a2578d 100644
--- a/src/libs/raceengineclient/raceengine.cpp
+++ b/src/libs/raceengineclient/raceengine.cpp
@@ -1019,7 +1019,8 @@ ReOneStep(double deltaTimeIncrement)
 
 		if (s->currentTime < -2.0)
 		{
-			sprintf(buf,"Race will start in %i seconds", -s->currentTime);
+			int t = -s->currentTime;
+			sprintf(buf,"Race will start in %i seconds", t);
 			ReRaceBigMsgSet(buf, 1.0);
 		}
 	}
diff --git a/src/libs/raceengineclient/racestate.cpp b/src/libs/raceengineclient/racestate.cpp
index 4a82f26e..806fb695 100644
--- a/src/libs/raceengineclient/racestate.cpp
+++ b/src/libs/raceengineclient/racestate.cpp
@@ -124,6 +124,9 @@ ReStateManage(void)
 				mode = ReRaceStart();
 				if (GetNetwork())
 				{
+					float f = GfTimeClock();
+					float rs = GetNetwork()->GetRaceStartTime();
+					ReInfo->s->currentTime = GfTimeClock() - GetNetwork()->GetRaceStartTime();
 					GetNetwork()->RaceInit(ReInfo->s);
 					GetNetwork()->SetRaceActive(true);
 				}
@@ -136,7 +139,11 @@ ReStateManage(void)
 
 			case RE_STATE_NETWORK_WAIT:
 					if (!WaitForNetwork())
+					{
 						ReInfo->_reState = RE_STATE_RACE;
+						ReSetRaceBigMsg("");
+						break;
+					}
 
 					if (GetNetwork())
 					{