Fixing SDC issue 74