Fix Henzell UTF-8 handling.