fix unicode handling