Update for unicode.