Fixing the date generator