FSSH-2: Fewest Switches Surface Hopping with robust switching probability