Change no date management
Invalid date fix
Merge pull request #2 from I-We/fix-no-date-issues

Fix no date issues