Unicode compatibility bugfix