Fixed charset bug