[*] BO : Improvement #PSCSX-1830