NXDRIVE-46: Fix unicode problem