timers: Real fix

There were a couple of logic error in the previous commit, fixed,
hopefully.