Added unicode check