fixed date related issue