Fixed current_goal in race