Fixed encoding problems