Another Unicode bugfix