Fixed the encoding problems