Fix in SI while dealing with timeouts