1557 Improve the timeout