Fixed the timeouts