Bug fix: #7216