Fixed gh-23 international characters are supported now.