Yet another attempt to fix charset issues