Added code to fix CSD edit issue.