DC | #3451 | Bug fix: