Fixed special character handling