Fix in case DATE is not present