Fix encoding issues for 1.9.3.