Fixiing Special character issue