Make timeouts work properly