Issue #126: Fixed the part of the issue in DC codebase