Fixed Special Character Handling