Fix for UTF-8 characters