SSP-1476 fixed