Update for Windows CN Encode