added fixed date issue