Fixes issue 369 regarding SSP/SHP.
Merge pull request #370 from ct-clearhaus/issue_369

Fixes issue 369 regarding SSP/SHP.