[-] FO: fixed bug #PSCSX-560  & #PSCSX-558
Merge pull request #1320 from sLorenzini/1.6

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