Timer bug fixed