fixed parseDate and parseNumber