Fixed Unicode support