CBR/CB7: Unicode fix