A first driving solution for a vehicle along a portion of a route is determined based on an agent detected in the vehicle's environment following a first trajectory of a plurality of possible trajectories. A switching time is determined for the vehicle to deviate from the first driving solution for a situation in which the agent is following a second trajectory of the plurality of possible trajectories. The first driving solution is revised such that the vehicle will be able to switch from the revised first driving solution to another driving solution at the switching time in case if the detected agent is following the second trajectory.