Fix analog of the timer bug