Another fix in the timer code