Fix date format issue