Another fix for multi-byte characters