Fixed a date with date generation