[-] FO : Fix for #PSCSX-627