Improve handling of probes on timeouts