Another fix to UTF-8 / Shift_JIS guessing