update for fix some charset problem