fixed date issues