Timer bug fix, whew