fixed enconding bug raised by customer