SOS-1223

The fix is clean