Now handling special chars better