Fixed encoding regression