Generated dates are now correct