Issue #8780 by tuj: Fixed bug