Fix bug with clearing timers