better handling of special chars