Faster timeout but is it correct?