diff --git a/src/libs/tgfdata/racemanagers.cpp b/src/libs/tgfdata/racemanagers.cpp
index 331822d86..4c9d244ac 100755
--- a/src/libs/tgfdata/racemanagers.cpp
+++ b/src/libs/tgfdata/racemanagers.cpp
@@ -596,9 +596,10 @@ GfTrack* GfRaceManager::getPreviousEventTrack(unsigned nEventIndex)
 		if (nEventIndex >= _vecEventTrackIds.size())
 			nEventIndex = _vecEventTrackIds.size() - 1;
 
-		if (nEventIndex >= 1)
-			pTrack =
-				GfTracks::self()->getTrack(_vecEventTrackIds[nEventIndex - 1]);
+		const unsigned nPrevEventIndex = // Beware: Previous of 1st = last.
+			(nEventIndex > 0) ? nEventIndex - 1 : _vecEventTrackIds.size() - 1;
+
+		pTrack = GfTracks::self()->getTrack(_vecEventTrackIds[nPrevEventIndex]);
 	}
 		   
 	return pTrack;