Handled corner case, increased timeout, made idempotent