added charset fix 2