SSP-539 Fixed