Fix unicode handling again