Fix problem with UTF8 charset