Fix for SDM