Fixed issue with non-ASCII characters