Encoding problems fixed