Fix issue while saving SO