Fix issue with timeouts