fixed bug: unicode fixes