Fix up the timeout mechanism