fixed some unicode handling