Fix issue #212 to support international characters