Fixed issue with date format