Fix expiring bug