Finished fixing date issue