Issue #8505 by tuj: Fixed the feature