Fixed minor bug in no timeout case