Improve timeout