Try harder to fix encoding problems