Timer bug fix