Fixed problems with unicode (hopefully)