Fix string to date issue