Fixed Unicode Issue