Fix date parsing issue