Push fix for UTF16Strings