[-] FO : Fix bug #PSCSX-831, additional escaping