Updated encoding problems