Fixed Date parsing issue