#SC-1

Issue #SC-1 fixed