Improved timeout.