Fixed support for unicode