Fixed Unicode Issues