[-] FO: fixed bug #PSCSX-560  & #PSCSX-558