Unicode fix

For issue #339