Another codepage-related fix