One More Fix to the Encoding Issue