oops, remove the timeout to avoid race condition