SSP-968 fixed bug
SSP-1340 fixed bug introduced when removing excess calls in SSP-1451