Fixed timer bug