bugfix + test for unicode support