Timer bug fix(2)