// Fix when date is null