Fixed a bug with current date