Issue #8490 by tuj: Fixed bug