Additional fix for encoding issues.