SOS-1223

Fix is clean