timer bug fix