Attempt #2 to fix encoding issues