Fixing date field