Fixed charset encoding bug