Fix remaining issue with PSCSX-1005