added charset fix