more care in handling the timeout