UNICODE fix for OIS