Timeout improvement