Current date bug fixed