Proper fix to unicode madness