Fixing date issue