Quick fix to avoid crash at end of race, full fix to follow later ;)