Fixed support for timeouts