fixed some date issue