fixed date problems