fixed charset support