More unicode madness fixed hopefully