Update to fix charset conflict