actually fix unicode handling.