Fix issue with date