timer bug removed