date issue fix