fixing date issue