[-] FO: Fix bug #PSCSX-394
Merge pull request #1238 from sLorenzini/Bugs

[-] FO: Fix some bugs