Fixed issue with date