Fixing the date setting