Fixed for JSSC part deux