Fixed special char escaping