Fixes issue 369 regarding SSP/SHP.