Fixed charset as well