Fix possible daily issue