Fixed the encoding problems

This one works for me. Can someone confirm?