fixed date issue