Fix SOS issue