HotFix for SDMs
Merge pull request #336 from jalabort/sdm_hotfix

HotFix for SDMs