Maybe fixed an issue with Unicode?