readded charset support