Improved timeout