Fix how unicode is handled