date issue fixed