APP-666 Issue withUnicode characters