another try at fixing unicode support in general