Make sure the timer always is cleared when done (#2005)

Make sure the timer always is cleared when done (#2005) #95