Fix Date parse issues

Fixed Date parse error