add support for non-ascii charcters