Removes a race condition

With the downside of not ticking for interval first. Punt on that for
now.