Fixed bug with Timeout